Continued to improve editor