diff --git a/doc/wallet/transaction/basic-transaction-wf.png b/doc/wallet/transaction/basic-transaction-wf.png
index 6a251004..a3508d5f 100644
Binary files a/doc/wallet/transaction/basic-transaction-wf.png and b/doc/wallet/transaction/basic-transaction-wf.png differ
diff --git a/doc/wallet/transaction/basic-transaction-wf.puml b/doc/wallet/transaction/basic-transaction-wf.puml
index 562a982b..1483407f 100644
--- a/doc/wallet/transaction/basic-transaction-wf.puml
+++ b/doc/wallet/transaction/basic-transaction-wf.puml
@@ -2,7 +2,7 @@
 
 title 
 **Current Grin Tranaction Workflow** 
-Accurate as of Aug 1, 2018 - Master branch only
+Accurate as of Oct 10, 2018 - Master branch only
 end title
 
 actor "Sender" as sender
@@ -44,7 +44,7 @@ note right of recipient
 	4: Calculate message **M** = **fee | lock_height **
 	5: Choose random nonce **kR** (private scalar)
 	6: Multiply **xR** and **kR** by generator G to create public curve points **xRG** and **kRG**
-	7: Compute Schnorr challenge **e** = SHA256(**M** | **kRG** + **kSG**)
+	7: Compute Schnorr challenge **e** = SHA256(**kRG** + **kSG** | **xRG** + **xSG** | **M**)
 	8: Compute Recipient Schnorr signature **sR** = **kR** + **e** * **xR**
 	9: Add **sR, xRG, kRG** to **Slate**
 	10: Create wallet output function **rF** that stores **receiver_output** in wallet with status "Unconfirmed"
@@ -61,10 +61,10 @@ end
 == Finalize Transaction ==
 note left of sender
 	1: Calculate message **M** = **fee | lock_height **
-	2: Compute Schnorr challenge **e** = SHA256(**M** | **kRG** + **kSG**)
+	2: Compute Schnorr challenge **e** = SHA256(**kRG** + **kSG** | **xRG** + **xSG** | **M**)
 	3: Verify **sR** by verifying **kRG** + **e** * **xRG** = **sRG**
 	4: Compute Sender Schnorr signature **sS** = **kS** + **e** * **xS**
-	5: Calculate final signature **s** = (**sS**+**sR**, **kSG**+**kRG**)
+	5: Calculate final signature **s** = (**kSG**+**kRG**, **sS**+**sR**)
 	6: Calculate public key for **s**: **xG** = **xRG** + **xSG**
 	7: Verify **s** against excess values in final transaction using **xG**
 	8: Create Transaction Kernel Containing: