No, I didn't replace the water pump, and it has guides on both the front and rear edges for the belt. Yes, I did put the lower part of the unit back together, leaving off only the upper inspection cover. So, no, I didn't leave much to chance. I think, really, ... Login to read more.