Updated changes till point 2 in Ningfeng's email.