Cda 55

@pamval Please review