progress on the editable mode