update hdd/cdd handling