added tengfei's stuff