fixed cm demo