updating headers
Merge branch 'hbs'