New bundle for submodules (with some minor modifications from me)