fix bug && accept
arrange