conclusion
small modifs
merge