Re-implemented spinner