These next lines need to be removed, they're already happening at line 55