adjustments for the new api library