added tokengetter