Changed naming and size of header