Header updates from Takuto