Updated editor, player