Changes according the comments of the first review