editing mode improvement # STILL UNSTABLE #