Need to work on editor