Oops sorry, that comment was intended for the next block of code, on line 579...