fixed edit & new