updates based on lib api changes