Commented and Updated code shipped with HW5