spinner again - changed and cleaned-up others