Added checks to ensure the previous commit does not destroy performance.
Added a river and David's new water.