use make_wrapper instead of providing our own wrapper