Made editing more intuitive