Updated api and changed timeout length