Some more changes to the CD model to try and fix the download issues.