Mitigating Impact on Waiver Expiration