incorporating the comments