Some modifications to the CEP output