Some changes in headers