change token to : instead of @