finished the first set of changes