Re-swizzled some scenarios