check point
check point
fix bugs