added stuff and removed stuff