Cleaned up DuckWave