make wraps types, simplify things