Add Waveshield and cleanup
Cleanup and waveshield
cleanup and waveshield