Implemented two-step change/restore