added support for Espresso 2