Implemented CDK-85 and CDK-131