replaced // comments  #2150