I am seriously thinking about getting the kit and doing my fuel pump. Looks like a simple job. Do you use all the parts that are shown/listed in the kit? I read something in one of the post about making sure you change the right one(diaphragm)?. I see that there appears to be 2 in the kit. Any help would be appreciated.<br />The reason for the rebuild is a slow die at idle, pump up the prime bulb and it is fine. <br />I ran in some 3-4 ft chop yesterday and seemed to be getting a little surge at 3000-3400, but really hard to tell in heavy chop and 20-25 mph wind, but tried to die on me when flushing. I checked and I haven't changed the fuel/water sep filtercsince February, so I got one on the back of the boat now to change. It is possible I could have water build up in the filter. That could easily cause some surge in choppy water. I run off of a 115 gallon onboard tank.