change code to fit jingning format