polling the API a little bit better