Added some, removed some others