update 21 & 58
modif
adding figures