removed some stuff and added some spam