CLC-2401 Changes per Yu-Hung's suggestions