edited some stuffs