Week 7

Updates for week 7.