Spindle upgrade incoming