first changes to implementation of editor