finalized changes for day 2