adjust to api changes