latest updates to week 3 pulled from master