new comments and minimal code change