Sailboat Ride with Waves Version 2