New changes from livre version