fixed the wrapper to match current style