Continue work on Editor