updated for espresso transition