modifiy day 2
merge changes from max and me