Restructure to allow combination of shade and bundle.