adaptations to new api