modified CuStates to be consistent with expr