some changes, including proper CD reset