edited some more