* Finally class updated