Compatible with forthcoming editor2. Should have no effect on editor1