updated to more api changes