Modified components with Ivan's sed-based tool.