Update header with better pattern
Rebuild