splitting out components, fixing pieces