This is a change we made for CS580 git exercise.