merge
added motion update to waves