improved synchronisation
rebase