CBF updates for CGTs

CBF updates for CGTs