[MATE] Make this spin a bit more feature-rich