last changes with editing