Better wave sim