updated with submodule latest commits