Improved editor