updated water basin formats