updated according to new spinners from app