update all api according to Arthur's comments