adding two new drink types and some totals