More splitting out of comoponents