using comprehensions for the gis, didn't speed it up enough i think. :(