make the new api closer to the old one