merged in important waves .54 changes