Added Cristhian's comments