second iteration of changes