addressed some of crdlc comments