diff --git a/story/utils.py b/story/utils.py
index 1a78b09..83ddbd5 100644
--- a/story/utils.py
+++ b/story/utils.py
@@ -126,6 +126,7 @@ first_to_second_mappings = [
     ("I'd", "you'd"),
     ("i", "you"),
     ("I've", "you've"),
+    ("I was", "you were"),
     ("my", "your"),
     ("we","you"),
     ("we're", "you're"),
@@ -141,6 +142,8 @@ second_to_first_mappings = [
     ("you're", "I'm"),
     ("your", "my"),
     ("you are", "I am"),
+    ("you were", "I was"),
+    ("are you", "am I"),
     ("you", "I"),
     ("you", "me"),
     ("you'll", "I'll"),