Pushing up emma 2.0 editor draft as of 100914