Updating with all of the revised code per assignment.