added spinner, not exactly sure if works cause everything happens too fast....