Edit for WAVE-Verification