Made changes

Working on line 120-126.