Initial work on fix for water not removing properly. NOT ACTIVATED.