code changes and comments