applied current API changes to CE.