Added more stuff for day_2