some little modif
merge done