change class name and fix formation