Cleaned up water balance