Cde 252

@pamval please review