Update more content to CPA friendly