Added consistent unspinning