classesDev now correctly handles Contour too