Update with the latest Editor code