improved performance changed geom a lot