moved around header code