Updated spec
Tidy
Adapted CHrat to framework