more changes May 4 incl new header