v2.5 improve speed and performance