added rest of cpe