Seems to be working and sped up a bit in some areas (although not perfect)