added ability to override old wrapper