Updated Assign2