small changes in wrapper