small changes for CEP-518