Updated by Cristiano Rastelli

Still to be discussed together, anymore