Adjust header, work in progress