modified some things in header