improved CoffeeMachine