adjusted wrapper