Swapped order of added components and applied expansion.