Check with the Factory
I've replaced both water and holding tanks on my 36, and I found that the tanks supplied by Catalina were of better quality and lower prices than what I could find elsewhere. They also fit perfectly. Check with them first! Good Luck.
