calculations changed to moving waves, needs further code yet