Add grace period logic