merged content from Tommaso