Modifications to get the scripts working with the CBC2