Add a choice now implemented with CBGV. TBD: Testing