edited some lines