moved everything from week3 to week2