Use the new swallow_id call