Added a spinner too #16