Added 2D swizzling