Combined Yifu's contribution