Logic change on line 111