Edits: Line 336 & line 361