debugging after yet more api changes