Minor modif (text+values)