#6201 edit mode starting to work