finalizing header changes