minor changes - TODO: unify implementations SMTI + CSP