Improved gamma, reduce module size