add some stuff, delete some other stuff :shipit: