Near final commit for Week 1