need to change class name as well