Updated for 1st assignment