Broken classes fixed using new ideas