Start to fix the editor