change class name to Client