second sync

It might need many commits