Works with both the old and new editors