As on the other pull request, why the wrapper?