Other contributions from Xu Fei

Author