- changed water
- some basic optimization