With class selection working