v1.31 imporve performance