An easy way to keep track of the bolts is to place each one into the matching hole in the new pump as you remove them, then when the old pump is out transfer them back. Install the new pump using same method.