Improved buffer-sync