Use grace period instead of initial delay