remove resolves and include loading spinners