API Efficiency fix