Near final commit for week 3