Refactored grains