changes for submodule use