Aug 21 - cd rewrite