towards merging code...