submodule changes from jon