Removed some, added some