Fix scenario and demo