Un-threaded WaveHandler
fixed merge conflicts