do some amend

as above