Last commit before overhaul of the synchronization schema