Commented out the CD check