Refactored Buffer Gas