Updating to use new API.