fixed submodule integration