Made changes to line 31