Working on token return