delete some code
add some function