Added End of Wave Grace Period