1. header improvements