I kept it simple and added a "baffled" sump, a -12 pickup, all top-mount AN fittings/sender, no crazy threaded fill elbow and enlarged the crossthrough tube to about 5x the original size (I don't like things touching the gas tank). No problems in over a decade...