Cta

Merge the CTA changes into master.