Fei's changes