edit code
fix bug