improved mapping performance - still not great