Improved the Editor System