Edited some stuffs