Changed how tokens are sent