Modified selectClass