You appear to be right, and the grace period only applies to goods acquired or made prior to the effective date, the public welfare requiring it. (I intend to start using that phrase a lot.)