Added "editing" capability