Hopeful bugfix/simplfication to crusade CB