1.finish edit CHAN_YANG; 2.adjust classes