Adding an @ to the end of the token string so we can find it reliably