bringing in Rafas changes week 1 and 2