Some code changes, too many work is waiting me;