Overhaul of toilet system to Y2