Add / remove some stuff