updated headers
Merge remote-tracking branch 'origin/EJ_headers'