Updated DrinkData, ready for review!