Moved call to header function to construct