Resolved #CM-6 demo