Waterproofing and Leakage solving