Re-edits from Vault #2