Changed structure of CPD
Merged