Changes to Day2 until Sec 2.4.2