Removed the CD check from SP.