Token logic in place