Improved subclass selection; added encrypted cells.