Some header and work rework