merge Fei's note into Fei(Shared)