update for last submodule merge