Improved edit