submodule joshfire modified