Should now works for both TState and CMSSM