add comments from yi
some conflicts happen merge by hand