Just kidding, one final huge speed improvement! :D