in progress fixing dynamic header info