change API a bit