Updated on the comments