Update with latest editor code