polished the cbr-eip demo