Updated Editor