A carbonator for use in a beverage dispenser may include a tank having a first end and a second end. An inlet in the second end of the tank may be configured to receive a supply of CO 2 . The carbonator may include a baffle in the tank between the first end and the second end and an orifice in the first end of the tank. The orifice may be structured and arranged to direct a stream of water into the tank. The baffle may be positioned in the tank so as to target a desired carbonation level of the water in the tank.