added spinner for loading - not working 100%