Adjusted API