added spinner, not sure if it working though