Added Zhian's comments