Added logic to determine if new editor should be used.