final comments #mr-1 Fixed

final comments #mr-1 Fixed