updated Patch48 to allign with upstream including headers