Restructured to use single-source.