add cepp and revise others