commiting modifications for exercise7-1