More work with new API.