add some and remove some code