Adjusted api