Optimize path finding upto 100x performance again