Csms 2 Domestic Water System Upgrade