final set of changes