Updated for week3