cd support, more cases pass