Aes header change...wip