Refactored gamma