Address all the comments