remove stuff, add some cool stuff