Added Kirong's changes