Re-edited some stuff