change class name and logic