made separate classes for classic and spock modes
Spinner added