added timeouts and loader