Fixed submodules
Restored two side sync