[Jason, Evgeny] editing progress