working towards merging of histories (catchup)