fix some bugs
fix bugs
fix bugs
Add some function