Some updates to header