Deep And Shallow Water Waves