CEPL works with these changes