change api a bit