Added some wrapping code, having issues with it