Week 8+9 changes