Added unfactored spare handling code.