editing mode works fine now