Editor improve