removed unecessary and incorrect spinner logic