api change and Anchor fix

api change and Anchor fix