Code changes for Day2 until Section 2.6