LAC-36: finished with edit and delete