Renamed addHeader functions to outputHeader etc.