merging from tanganelli