renamed class for correctness