updated to not use submodules