Yep, You got it. My 560sel did the same thing. Replaced hydralic Lifters, rocker arms and cam shaft on right side and sound went away. Not really hard to do either. And not to expensive about $550.00 FOR ALL THE PARTS. Have fun!