Resynching fork with 2.0