Added new, improved spinner