[TODO-LIST #003] Yanmin:did some improved.