Yep, you are right. Look at top pic and you will see AN fittings for feed and return on pump module, the smaller one on left is the new sending unit, above fuel level and bolted down...no leaks or lame tin lock ring. The black rubber line on pump joins tank vent to pump unit vent and goes to roll over valve. The regulated filter is a common Jeep part(surprised?) easily replaced for $30-$35 at most part stores. The AN fittings are USA made by Russell's supplier as is rubber NHRA approved soft line and filter!