slight modifs
first version
merge