better class slection