Improvements on demo waves
Fixed merge conflict