Added Q and better E to WaveClear