Refining to ensure grunt passes