Taken comments in consideration