Added some stuff, removed some stuff