Added updated EBs and CBs