change the mode of destroy
add setup
Merge branch 'cal' into ljx
add setup and modify setup