Improved editor some