Updated for Companion.