some swizzling updates