Scenario & Coffee Machine modified