Big changes in the comments