changed strategy for new disks, changed label handling