almost done with one full pass of changes