CD improvments