Refining done based on the comments by mentor