Increased complexity to 2 API calls
Working