CLC-2512 Tweaks per feedback from Ray and Yu-Hung