Upgraded editor