Make some changes on Project 4