integrated sergio and gianluca contributions
removed stuff
major