C&C 35-3 fuel tank
The tank came out through the lazarette ok. You need to remove the shut-off valve first as it is a pretty tight fit. The new tank cost $300 plus shipping. It is an exact replacement for the original. I am not sure about the baffles. I think that there is one in original. I was was planning on just having the tank cleaned in preparation for an offshore race next year, but when we got it out we found that there were a couple of quarter sized corrosion areas on the bottom that looked likely to fail.