wrapping works again, now with kwargs