change api return stuff to improve performance