2nd modification for assignment