A small design change
Comment flow improved