[#1865] Faris/Kisitu - Refactored sync method. More is needed.