Removed addition headerwrap