Changed headers and header sizes