Removed some stuff and well, added some stuff.