edited some parts