adding submodules back in