Further address the comments