Update for Week11-Final