Make it more async without flood on the api