Some cross-linking and DRY