RW: adjusted header