Updated week 2 and week 3