Update to add naive spinner