added CBQ functionality