added and removed some