Updated for API choices.