Remade the broken classes