Editor improved