I've got a slight tapping on the X18XE1, it could be normal although the water pump is due a change (they didn't do it when the cambelt was last changed) so I'm thinking of changing it anyway. Is there any easy way to check visibly whether it needs to be replaced, short of removing it? I would quite like to assess the urgency before going to the effort of replacing it in a rush.

Also will I need to buy anything else for taking off and replacing the same cambelt? Like new bolts for the tensioner? I've got the cam locking tool.

Much appreciated.