Include the bbb and shape uncertainties