Sandworm's edit, v2

Improves the spares patch