Working on the comments