added optimized CDP