Final commit from do-1