Tested, broken class corrected