cd sync improvements, part2