Update 2_3

simplification de code :p