Includes both. Figure has nice tight joints and a good oring