working editing + new step