Fixed 1d
Fixed 2d quad to be used in both 2d and 3d