You are on the right track. A full tune up probably wouldn't hurt either