Updated to remove swizzling, etc.