Few changes and comment