simplified and improved water logic