Added and removed some stuff