Approx 10x performance improvement!