update #3

remove has bugs.