greatly simplified the wrapper