Added a spinner
Clean up