removed some stuff, added some stuff