Added spinner stuff