More from saphira

For diffing later.