Support b_cubed_plus; move stuff around