closes #8 support for upright and cocktail modes