Lots of components for the new pumping region
resolve merge conflicts I think