More changes in order to fix the synchro