changed class names for 2d to Class(2d)