added in routing. Pruned classes