Bugfix+remove spinning