Moved saving of controls to hook method