Grace period finalized and working