change and add comments