work on design and functionnality
--