removed OutputWave and added bubbles to wavelets