This version is intended for CMSMS pre 0.11