Corrected CBDemo Class