Added Jialin's Code