add Scalar type back in.