Addressing Yifeis commments