improved/tightened spacing; exploded grace period into its specific uses