[Major] minor re-thinking synchronisation - now the maps are synced.