Strange, my plastic gas tank on my Carravan has no baffles, and no sump, just the canister with the pump-filter and fill gauge all in a drop in piece. They have a spring setup that adjusts the pump to the depth of tank. Why can't something like that be retroed in an existing tank? In fact, I have 4 non working ones from various cars that I scrounged out of the junk pile of the fix it shop next door to compare. Biggest thing is making a new lid to seal to tank, I like the idea of the no return line, bypassing back into tank, then dead head with a Holly pressure reg set at 6-7 pounds.