Why not just move lines 77-79 here?