added spinner stuff