Changed structure, modified editor and ES