Week 3 improvements