ECPP changes for 1.03, step 1