Finished Waive

Finished Waive