master - NEW: removing spinner for now