updating with waterbodyID handling