Water cleanup & sun test
merge