modif from gpatriarche