Address the comments