Added comments from Xuan.