Well, I figured out where the noise was coming from that I thought was rockers or timing chain. It's the water pump. I consider that good news. A couple questions since others have gone through this... Which brand is good these days, since brands like Graf are suppose to be made in Europe but at least some are made in China according to other feedback. Next question is, I currently run an original 5-blade fan. Should I get a different pump and change fans/clutch? I'm adding an electric pusher fan anyway, but I like the idea of the engine driven fan disengaging. Or, just get a 9-blade fan and call it good?