change tokenlist to return array