change class name
fix bugs