got a simpler wrapper working without wrapping the user context