Based on recommendations from this site (Randy and Marsh in the " More Leaking Carbs" thread, I believe), I installed an Airtex E8016S (the thread listed it as ES8016S, but the correct number doesn't have the first S) and it works GREAT! Bought it for $51 @ Advance auto (in stock at my local store), had to buy some brass fittings (Ace Hardware) due to the inlet/outlet being on opposite ends. I ran the outlet toward the back of the bike and was able to utilize the stock fuel lines without splicing. I removed the provided strainer (I just replaced the stock filter) to keep the install more compact, but it could have been utilized as well. About $65 total vs. the $350+ that Yamaha wanted for a stock pump. Less noisy, easily replaced, and it fits in the stock bracket. Plus it's NEW, so no worries about a used part.