remove and add some stuff