change headers, organize