deleted and added some stuff