More components to less