added and removed stuff