Switch to submodules for surround and repeat