Updated Docs from Giovanni Mugnai