Updated regarding to the comments