updated version of wrapper