Added Mingyu's changes