new changes
141027 fixed conflict