New version of the wrapper