Vastly improved synching: code is much shorter, performance is greatly
improved