Improved editor performances