CSM version 2.0

TBD