update for correct classes