add some function and remove another