changed api to be cuter