diff --git a/SampleApp/SAViewController.h b/SampleApp/SAViewController.h
index 0b89461..e616441 100644
--- a/SampleApp/SAViewController.h
+++ b/SampleApp/SAViewController.h
@@ -8,7 +8,11 @@
 
 #import <UIKit/UIKit.h>
 
-@interface SAViewController : UIViewController
+@interface SAViewController : UIViewController {
+    NSString *code;
+}
+
+@property (atomic, copy) NSString *code;
 
 - (IBAction)setPIN;
 - (IBAction)checkPIN;
diff --git a/SampleApp/SAViewController.m b/SampleApp/SAViewController.m
index 4b9dca0..9ec500e 100644
--- a/SampleApp/SAViewController.m
+++ b/SampleApp/SAViewController.m
@@ -12,18 +12,31 @@
 
 @implementation SAViewController
 
+@synthesize code;
+
+- (void)viewDidLoad {
+    // Set default code
+    self.code = @"0187";
+}
+
 - (IBAction)setPIN {
     GCPINViewController *PIN = [[GCPINViewController alloc]
                                 initWithNibName:nil
                                 bundle:nil
                                 mode:GCPINViewControllerModeCreate];
     PIN.messageText = @"Enter a passcode";
+    PIN.confirmText = @"Confirm your passcode";
     PIN.errorText = @"The passcodes do not match";
     PIN.title = @"Set Passcode";
-    PIN.verifyBlock = ^(NSString *code) {
-        NSLog(@"setting code: %@", code);
+    PIN.verifyBlock = ^(NSString *newCode) {
+        NSLog(@"setting code: %@", newCode);
+        self.code = newCode;
         return YES;
     };
+    PIN.cancelBlock = ^ {
+        NSLog(@"Cancelling PIN setting");
+    };
+    PIN.cancelButtonVisible = YES;
     [PIN presentFromViewController:self animated:YES];
     [PIN release];
 }
@@ -36,10 +49,14 @@ - (IBAction)checkPIN {
     PIN.messageText = @"Enter your passcode";
     PIN.errorText = @"Incorrect passcode";
     PIN.title = @"Enter Passcode";
-    PIN.verifyBlock = ^(NSString *code) {
-        NSLog(@"checking code: %@", code);
-        return [code isEqualToString:@"0187"];
+    PIN.verifyBlock = ^(NSString *enteredCode) {
+        NSLog(@"checking code: %@", enteredCode);
+        return [enteredCode isEqualToString:self.code];
+    };
+    PIN.cancelBlock = ^ {
+        NSLog(@"Cancelling verification");
     };
+    PIN.cancelButtonVisible = YES;
     [PIN presentFromViewController:self animated:YES];
     [PIN release];
 }
diff --git a/pinview/GCPINViewController.h b/pinview/GCPINViewController.h
index 437a5db..72c4f88 100644
--- a/pinview/GCPINViewController.h
+++ b/pinview/GCPINViewController.h
@@ -29,6 +29,7 @@ typedef enum {
 } GCPINViewControllerMode;
 
 typedef BOOL (^GCPasscodeVerifyBlock) (NSString *code);
+typedef void (^GCPasscodeCancelBlock) ();
 
 /*
  
@@ -49,6 +50,12 @@ typedef BOOL (^GCPasscodeVerifyBlock) (NSString *code);
  */
 @property (nonatomic, copy) NSString *messageText;
 
+/*
+ 
+ Set the text to display below the input area when confirming a set PIN 
+ */
+@property (nonatomic, copy) NSString *confirmText;
+
 /*
  
  Set the text to display below the input area when the passcode fails
@@ -70,6 +77,13 @@ typedef BOOL (^GCPasscodeVerifyBlock) (NSString *code);
  */
 @property (nonatomic, copy) GCPasscodeVerifyBlock verifyBlock;
 
+/*
+ 
+ Called when cancelling out of passcode entry or verification.
+ 
+ */
+@property (nonatomic, copy) GCPasscodeCancelBlock cancelBlock;
+
 /*
  
  Refer to `GCPINViewControllerMode`. This can only be set through the
@@ -103,5 +117,7 @@ typedef BOOL (^GCPasscodeVerifyBlock) (NSString *code);
 @property (nonatomic, retain) IBOutlet UILabel *messageLabel;
 @property (nonatomic, retain) IBOutlet UILabel *errorLabel;
 @property (nonatomic, retain) IBOutlet UITextField *inputField;
+@property (nonatomic, retain) IBOutlet UIBarButtonItem *cancelButton;
+@property (nonatomic, assign) BOOL cancelButtonVisible;
 
 @end
diff --git a/pinview/GCPINViewController.m b/pinview/GCPINViewController.m
index 4c84ff7..e54360a 100644
--- a/pinview/GCPINViewController.m
+++ b/pinview/GCPINViewController.m
@@ -46,11 +46,15 @@ @implementation GCPINViewController
 @synthesize errorLabel = __errorLabel;
 @synthesize inputField = __inputField;
 @synthesize messageText = __messageText;
+@synthesize confirmText = __confirmText;
 @synthesize errorText = __errorText;
 @synthesize labels = __labels;
 @synthesize mode = __mode;
 @synthesize text = __text;
 @synthesize verifyBlock = __verifyBlock;
+@synthesize cancelBlock = __cancelBlock;
+@synthesize cancelButton = __cancelButton;
+@synthesize cancelButtonVisible = __cancelButtonVisible;
 
 #pragma mark - object methods
 - (id)initWithNibName:(NSString *)nib bundle:(NSBundle *)bundle mode:(GCPINViewControllerMode)mode {
@@ -85,10 +89,13 @@ - (void)dealloc {
     self.errorLabel = nil;
     self.inputField = nil;
     self.messageText = nil;
+    self.confirmText = nil;
     self.errorText = nil;
     self.labels = nil;
     self.text = nil;
     self.verifyBlock = nil;
+    self.cancelBlock = nil;
+    self.cancelButton = nil;
 	
     // super
     [super dealloc];
@@ -129,11 +136,22 @@ - (void)dismiss {
         [[UIApplication sharedApplication] endIgnoringInteractionEvents];
     });
 }
+- (void)cancel {
+    __dismiss = YES;
+    if ( self.cancelBlock != nil ) {
+        self.cancelBlock();
+    }
+    [self dismissModalViewControllerAnimated:YES];
+}
 
 #pragma mark - view lifecycle
 - (void)viewDidLoad {
 	[super viewDidLoad];
-    
+
+    // wire up cancel button
+    self.cancelButton.target = self;
+    self.cancelButton.action = @selector(cancel);
+
     // setup labels list
     self.labels = [NSArray arrayWithObjects:
                    self.fieldOneLabel,
@@ -158,6 +176,11 @@ - (void)viewDidLoad {
     [self.inputField becomeFirstResponder];
 	
 }
+
+- (void)viewWillAppear:(BOOL)animated {
+    self.navigationItem.leftBarButtonItem = self.cancelButtonVisible ? self.cancelButton : nil;
+}
+
 - (void)viewDidUnload {
 	[super viewDidUnload];
 	self.fieldOneLabel = nil;
@@ -169,6 +192,7 @@ - (void)viewDidUnload {
     self.inputField = nil;
     self.labels = nil;
     self.text = nil;
+    self.cancelButton = nil;
 }
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orientation {
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
@@ -190,6 +214,10 @@ - (void)setErrorText:(NSString *)text {
     __errorText = [text copy];
     self.errorLabel.text = __errorText;
 }
+- (void)setCancelButtonVisible:(BOOL)cancelButtonVisible {
+    __cancelButtonVisible = cancelButtonVisible;
+    self.navigationItem.leftBarButtonItem = cancelButtonVisible ? self.cancelButton : nil;
+}
 
 #pragma mark - text field methods
 - (void)textDidChange:(NSNotification *)notif {
@@ -200,6 +228,12 @@ - (void)textDidChange:(NSNotification *)notif {
             if (self.mode == GCPINViewControllerModeCreate) {
                 if (self.text == nil) {
                     self.text = self.inputField.text;
+                    
+                    // Display confirm text if it's been set
+                    if ( self.confirmText != nil ) {
+                        self.messageLabel.text = self.confirmText;
+                    }
+                    
                     [self resetInput];
                 }
                 else {
@@ -207,7 +241,10 @@ - (void)textDidChange:(NSNotification *)notif {
                         self.verifyBlock(self.inputField.text)) {
                         [self dismiss];
                     }
-                    else {
+                    else {                        
+                        // Reinstate original message text
+                        self.messageLabel.text = self.messageText;
+                        
                         [self wrong];
                     }
                 }
diff --git a/pinview/GCPINViewController~ipad.xib b/pinview/GCPINViewController~ipad.xib
index 37c54ee..e1a1293 100644
--- a/pinview/GCPINViewController~ipad.xib
+++ b/pinview/GCPINViewController~ipad.xib
@@ -12,6 +12,7 @@
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBUITextField</string>
+			<string>IBUIBarButtonItem</string>
 			<string>IBUIImageView</string>
 			<string>IBUIView</string>
 			<string>IBUILabel</string>
@@ -240,7 +241,6 @@
 								<string key="NSFrame">{{20, 136}, {280, 21}}</string>
 								<reference key="NSSuperview" ref="898314207"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
 								<int key="IBUIContentMode">7</int>
@@ -331,6 +331,11 @@
 				</object>
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 			</object>
+			<object class="IBUIBarButtonItem" id="25667243">
+				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+				<int key="IBUIStyle">1</int>
+				<int key="IBUISystemItemIdentifier">1</int>
+			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
@@ -398,6 +403,14 @@
 					</object>
 					<int key="connectionID">33</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">cancelButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="25667243"/>
+					</object>
+					<int key="connectionID">35</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -499,6 +512,11 @@
 						<reference key="object" ref="812647999"/>
 						<reference key="parent" ref="191373211"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">34</int>
+						<reference key="object" ref="25667243"/>
+						<reference key="parent" ref="0"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -519,12 +537,13 @@
 				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="32.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">33</int>
+			<int key="maxID">35</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -532,6 +551,7 @@
 					<string key="className">GCPINViewController</string>
 					<string key="superclassName">UIViewController</string>
 					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="cancelButton">UIBarButtonItem</string>
 						<string key="errorLabel">UILabel</string>
 						<string key="fieldFourLabel">UILabel</string>
 						<string key="fieldOneLabel">UILabel</string>
@@ -541,6 +561,10 @@
 						<string key="messageLabel">UILabel</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="cancelButton">
+							<string key="name">cancelButton</string>
+							<string key="candidateClassName">UIBarButtonItem</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="errorLabel">
 							<string key="name">errorLabel</string>
 							<string key="candidateClassName">UILabel</string>
diff --git a/pinview/GCPINViewController~iphone.xib b/pinview/GCPINViewController~iphone.xib
index 0daf054..b7a3390 100644
--- a/pinview/GCPINViewController~iphone.xib
+++ b/pinview/GCPINViewController~iphone.xib
@@ -13,6 +13,7 @@
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<string>IBUILabel</string>
+			<string>IBUIBarButtonItem</string>
 			<string>IBUIImageView</string>
 			<string>IBUIView</string>
 			<string>IBUITextField</string>
@@ -47,7 +48,6 @@
 						<string key="NSFrame">{{95, 245}, {97, 31}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -384,6 +384,11 @@ AAgACAAIAAEAAQABAAE</bytes>
 				</object>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
+			<object class="IBUIBarButtonItem" id="978034639">
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				<int key="IBUIStyle">1</int>
+				<int key="IBUISystemItemIdentifier">1</int>
+			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -452,6 +457,14 @@ AAgACAAIAAEAAQABAAE</bytes>
 					</object>
 					<int key="connectionID">58</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">cancelButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="978034639"/>
+					</object>
+					<int key="connectionID">62</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -558,6 +571,11 @@ AAgACAAIAAEAAQABAAE</bytes>
 						<reference key="object" ref="821815932"/>
 						<reference key="parent" ref="711939528"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">61</int>
+						<reference key="object" ref="978034639"/>
+						<reference key="parent" ref="0"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -580,6 +598,7 @@ AAgACAAIAAEAAQABAAE</bytes>
 					<string>50.IBPluginDependency</string>
 					<string>51.IBPluginDependency</string>
 					<string>52.IBPluginDependency</string>
+					<string>61.IBPluginDependency</string>
 					<string>9.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
@@ -601,6 +620,7 @@ AAgACAAIAAEAAQABAAE</bytes>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -615,7 +635,7 @@ AAgACAAIAAEAAQABAAE</bytes>
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">58</int>
+			<int key="maxID">62</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -627,6 +647,7 @@ AAgACAAIAAEAAQABAAE</bytes>
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>cancelButton</string>
 							<string>errorLabel</string>
 							<string>fieldFourLabel</string>
 							<string>fieldOneLabel</string>
@@ -637,6 +658,7 @@ AAgACAAIAAEAAQABAAE</bytes>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>UIBarButtonItem</string>
 							<string>UILabel</string>
 							<string>UILabel</string>
 							<string>UILabel</string>
@@ -650,6 +672,7 @@ AAgACAAIAAEAAQABAAE</bytes>
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>cancelButton</string>
 							<string>errorLabel</string>
 							<string>fieldFourLabel</string>
 							<string>fieldOneLabel</string>
@@ -660,6 +683,10 @@ AAgACAAIAAEAAQABAAE</bytes>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">cancelButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">errorLabel</string>
 								<string key="candidateClassName">UILabel</string>