some changes to Day and Main