Rearranged when the sync happens