Commiting part 3 changes