Make spin work better