Removed time limits and refactored api calls