Sorted bundles
Moved configurations around