changed after add a new class
some sympoles renamed
changed after add a new class and make some modifying