add/remove some functionality