Changed headline tokens and added info tokens