there might be other places in this pull request where comments should be updated too.