Notice that the code here hasn't exactly the same code structure as in the tutorial. I'm still not happy with the water surface ...