change common.xml(36-37,42-43,162)