Update for new comm changes.