Final design
Updated doc