fix performace and adpt the sdk changes