Started integrating the comments of reviewer 2