name changes and add comments