improved unlock/lock. first steps save and cancel