I have the 31 gallon tank in my blazer and it's been dented down to 25ish gallons. When I took it off today due to rotting gas lines, I noticed the baffle had been broken loose again. I fixed this some number of years ago, but the dents in the tank pushed it off again. I'd like to find a smaller tank, that still uses a similar sending unit. I know there is the 24ish gallon tank from suburbans, anything smaller? What tanks would use a similar sending unit? Any one know what astro/safari vans use? How about S10's? I'm assuming car tanks would be different.