Update header
Update to behave as wanted