accept latest changes

accept latest changes.