larger structural update (moved info to header)