Updated to week 2 and week 3