Work-in-progress adapting to new API