More work on improving the wrapper