imported some waves 0.54 changes