More Swizzles in more places