Changes on edit and new