Yes upper ball joint, it's cheap easy and you're already in there. Hold on to a CV incase of catastrophe on the trail. Are you going with all new hub flanges? Might help with the "Clunk".Thanks, yeah I'm just replacing. Not going to bother rebooting old CVs once I've committed to getting in there. Rebooting the upper ball joints you mean? had not considered that.