Added a spinner to avoid heart attacks