Uses API better