do some changes

do some changes.