Made some changes to line 16