Updates for week-1-assignment-0 and week-2-assignment-1