Added throbber
Removed old function