added static header, more fixing