removed and added some