modify for Spire