- removed use of wrapper function
- removed unused wrapper frunction