Changing setup to reference Whiskey