little change if duaui checking cleader part

FROM THIS CHANGE ALL CHANGE WILL NOT BEEN COMPLIE TEST, YOU WILL NEED
DO IT YOURSELF AND BUG REPORT IF THERE ARE WARNING MESSAGE OR RUNTIME
ERROR.