Updated to CEP5