add comments on the current behaviour