gamma refactor happy