Finished changes 2