Updated for up to week 3 material