Updated with CD objectives