Adjustments to friends of c&d (see #30)