little changes in support of cdr