Some smoth in the interaction + and some cleaning done as well