Save changes reworked