adding everything from week 2