I will remove all valves and repipe the copper pipe for the tree. This will make sure all valves work and the existing leak get taken care of. I installed a new number 1, vacation valve, irrigation and a new prv with a hammer arrestor.