added work tutti fatti
conflict merge
added trace