Long way towards editor redesign