- Removing unnecessart imports
- Adding more safety to prevent multiple requests