update for vanilla api changes