Whiskey use case rewritten