change api a little bit