it works better than before. but need to optimize on network calls