added waves, observer debugging