cda and ccd lots refactored