Better sync

latest commit fbadd91ee3
@mc1100 authored