diff --git a/ASDKCore.xcodeproj/project.pbxproj b/ASDKCore.xcodeproj/project.pbxproj
index 797b4f2..e4160fb 100644
--- a/ASDKCore.xcodeproj/project.pbxproj
+++ b/ASDKCore.xcodeproj/project.pbxproj
@@ -696,7 +696,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = ASDK;
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "TCS Bank";
 				TargetAttributes = {
 					83166ED21C63984E00533D85 = {
@@ -839,6 +839,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -898,6 +899,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore-universal.xcscheme b/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore-universal.xcscheme
index 0df2f8b..cd73047 100644
--- a/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore-universal.xcscheme
+++ b/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore-universal.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore.xcscheme b/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore.xcscheme
index 12338ab..fa89092 100644
--- a/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore.xcscheme
+++ b/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ASDKUI.xcodeproj/project.pbxproj b/ASDKUI.xcodeproj/project.pbxproj
index 487331c..a8971c2 100644
--- a/ASDKUI.xcodeproj/project.pbxproj
+++ b/ASDKUI.xcodeproj/project.pbxproj
@@ -655,7 +655,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = ASDK;
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "TCS Bank";
 				TargetAttributes = {
 					8316724E1C64798800533D85 = {
@@ -837,6 +837,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -897,6 +898,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI-universal.xcscheme b/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI-universal.xcscheme
index 78cfc5f..1a6846f 100644
--- a/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI-universal.xcscheme
+++ b/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI-universal.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI.xcscheme b/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI.xcscheme
index 707370c..b68bf6c 100644
--- a/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI.xcscheme
+++ b/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ASDKUI/Payment/PaymentFormStarter/ASDKDesignConfiguration.h b/ASDKUI/Payment/PaymentFormStarter/ASDKDesignConfiguration.h
index 0caba5b..93265ec 100644
--- a/ASDKUI/Payment/PaymentFormStarter/ASDKDesignConfiguration.h
+++ b/ASDKUI/Payment/PaymentFormStarter/ASDKDesignConfiguration.h
@@ -162,8 +162,12 @@ typedef NS_ENUM(NSUInteger, TableViewCellType)
  *
  *  @param style - стиль статус бара
  */
-
 - (void)setStatusBarStyle:(UIStatusBarStyle)style;
 - (UIStatusBarStyle)statusBarStyle;
 
+- (void)setPresentationCompletion:(void (^)(void))presentationCompletion;
+- (void (^)(void))getPresentationCompletion;
+- (void)setPresentAnimated:(BOOL)animated;
+- (BOOL)shouldAnimate;
+
 @end
diff --git a/ASDKUI/Payment/PaymentFormStarter/ASDKDesignConfiguration.m b/ASDKUI/Payment/PaymentFormStarter/ASDKDesignConfiguration.m
index 0d9a43b..1f24b2f 100644
--- a/ASDKUI/Payment/PaymentFormStarter/ASDKDesignConfiguration.m
+++ b/ASDKUI/Payment/PaymentFormStarter/ASDKDesignConfiguration.m
@@ -48,6 +48,9 @@ @interface ASDKDesignConfiguration ()
 
 @property (nonatomic, strong) NSString *payViewControllerTitle;
 
+@property (nonatomic, strong) void (^presentationCompletion)(void);
+@property (nonatomic) BOOL _presentAnimated;
+
 @end
 
 @implementation ASDKDesignConfiguration
@@ -68,6 +71,7 @@ - (id)init
         }
     __statusBarStyle = [[UIApplication sharedApplication] statusBarStyle];
 		__presentStyleModal = UIModalPresentationFullScreen;
+        __presentAnimated = YES;
 	}
 
     return self;
@@ -340,4 +344,22 @@ - (NSString *)payViewTitle
 	return self.payViewControllerTitle;
 }
 
+- (void)setPresentationCompletion:(void (^)(void))presentationCompletion
+{
+    _presentationCompletion = presentationCompletion;
+}
+- (void (^)(void))getPresentationCompletion
+{
+    return _presentationCompletion;
+}
+
+-(void)setPresentAnimated:(BOOL)animated
+{
+    __presentAnimated = animated;
+}
+-(BOOL)shouldAnimate
+{
+    return __presentAnimated;
+}
+
 @end
diff --git a/ASDKUI/Payment/PaymentFormStarter/ASDKPaymentFormStarter.m b/ASDKUI/Payment/PaymentFormStarter/ASDKPaymentFormStarter.m
index 2a8dcdc..908751d 100644
--- a/ASDKUI/Payment/PaymentFormStarter/ASDKPaymentFormStarter.m
+++ b/ASDKUI/Payment/PaymentFormStarter/ASDKPaymentFormStarter.m
@@ -170,37 +170,41 @@ - (void)presentPaymentFormFromViewController:(UIViewController *)presentingViewC
 {
     [self prepareDesign];
     
-    ASDKPaymentFormViewController *vc = [[ASDKPaymentFormViewController alloc] initWithAmount:amount
-                                                                                      orderId:orderId
-                                                                                        title:title
-                                                                                  description:description
-                                                                                       cardId:cardId
-                                                                                        email:email
-                                                                                  customerKey:customerKey
-																					recurrent:recurrent
-																				   makeCharge:makeCharge
-																		additionalPaymentData:data
-																				  receiptData:receiptData
-																					shopsData:shopsData
-																			shopsReceiptsData:shopsReceiptsData
-                                                                                      success:^(ASDKPaymentInfo *paymentInfo)
-                                         {
-                                             [ASDKPaymentFormStarter resetSharedInstance];
-                                             
-                                             onSuccess(paymentInfo);
-                                         }
-                                                                                    cancelled:^
-                                         {
-                                             [ASDKPaymentFormStarter resetSharedInstance];
-                                             
-                                             onCancelled();
-                                         }
-                                                                                        error:^(ASDKAcquringSdkError *error)
-                                         {
-                                             [ASDKPaymentFormStarter resetSharedInstance];
-                                             
-                                             onError(error);
-                                         }];
+    ASDKPaymentFormViewController *vc = [
+                                         [ASDKPaymentFormViewController alloc]
+                                         initWithAmount:amount
+                                         orderId:orderId
+                                         title:title
+                                         description:description
+                                         cardId:cardId
+                                         email:email
+                                         customerKey:customerKey
+                                         recurrent:recurrent
+                                         makeCharge:makeCharge
+                                         additionalPaymentData:data
+                                         receiptData:receiptData
+                                         shopsData:shopsData
+                                         shopsReceiptsData:shopsReceiptsData
+                                         success:^(ASDKPaymentInfo *paymentInfo) {
+        [ASDKPaymentFormStarter resetSharedInstance];
+        if (onSuccess != nil)
+        {
+            onSuccess(paymentInfo);
+        }
+    }
+                                         cancelled:^{
+        [ASDKPaymentFormStarter resetSharedInstance];
+        if (onCancelled != nil){
+            onCancelled();
+        }
+    }
+                                         error:^(ASDKAcquringSdkError *error){
+        [ASDKPaymentFormStarter resetSharedInstance];
+        if (onError != nil)
+        {
+            onError(error);
+        }
+    }];
     
     vc.acquiringSdk = self.acquiringSdk;
 
@@ -209,7 +213,10 @@ - (void)presentPaymentFormFromViewController:(UIViewController *)presentingViewC
 
     [ASDKCardsListDataController cardsListDataControllerWithAcquiringSdk:self.acquiringSdk customerKey:customerKey];
 
-    [presentingViewController presentViewController:nc animated:YES completion:nil];
+    [presentingViewController presentViewController:nc
+                                           animated:self.designConfiguration.shouldAnimate
+                                         completion:self.designConfiguration.getPresentationCompletion
+     ];
 }
 
 #pragma mark - Loader
@@ -363,7 +370,10 @@ - (void)payWithApplePayFromViewController:(UIViewController *)presentingViewCont
 			if (viewController)
 			{
 				self.presentingViewControllerApplePay = presentingViewController;
-				[self.presentingViewControllerApplePay presentViewController:viewController animated:YES completion:^{}];
+				[self.presentingViewControllerApplePay presentViewController:viewController
+                                                                    animated:self.designConfiguration.shouldAnimate
+                                                                  completion:self.designConfiguration.getPresentationCompletion
+                 ];
 			}
 			else
 			{
@@ -447,7 +457,10 @@ - (void)payUsingApplePayFromViewController:(UIViewController *)presentingViewCon
 			if (viewController)
 			{
 				self.presentingViewControllerApplePay = presentingViewController;
-				[self.presentingViewControllerApplePay presentViewController: viewController animated: YES completion:^{}];
+				[self.presentingViewControllerApplePay presentViewController: viewController
+                                                                    animated:self.designConfiguration.shouldAnimate
+                                                                  completion:self.designConfiguration.getPresentationCompletion
+                 ];
 			}
 			else
 			{
@@ -467,11 +480,17 @@ - (void)checkStatusTransaction:(NSString *)paymentId
 					   success:(void (^)(ASDKPaymentStatus status))onSuccess
 						 error:(void (^)(ASDKAcquringSdkError *error))onError
 {
-	[self.acquiringSdk getStateWithPaymentId:paymentId success:^(ASDKPaymentInfo *paymentInfo, ASDKPaymentStatus status) {
-		onSuccess(status);
-	} failure:^(ASDKAcquringSdkError *error) {
-		onError(error);
-	}];
+    [self.acquiringSdk getStateWithPaymentId:paymentId success:^(ASDKPaymentInfo *paymentInfo, ASDKPaymentStatus status) {
+        if (onSuccess != nil)
+        {
+            onSuccess(status);
+        }
+    } failure:^(ASDKAcquringSdkError *error) {
+        if (onError != nil)
+        {
+            onError(error);
+        }
+    }];
 }
 
 - (void)refundTransaction:(NSString *)paymentId
@@ -479,9 +498,15 @@ - (void)refundTransaction:(NSString *)paymentId
 					error:(void (^)(ASDKAcquringSdkError *error))onError
 {
 	[self.acquiringSdk rejectTrancastionWithPaymentId:paymentId success:^(ASDKCancelResponse *response) {
-		onSuccess();
+        if (onSuccess != nil)
+        {
+            onSuccess();
+        }
 	} failure:^(ASDKAcquringSdkError *error) {
-		onError(error);
+        if (onError != nil)
+        {
+            onError(error);
+        }
 	}];
 }
 
@@ -506,93 +531,114 @@ - (void)chargeWithRebillId:(NSNumber *)rebillId
 
 	[paymentData setObject:@(YES) forKey:@"chargeFlag"];
 
-	[self.acquiringSdk initWithAmount:[NSNumber numberWithDouble:100 * amount.doubleValue]
-							  orderId:orderId
-						  description:description
-							  payForm:nil
-						  customerKey:customerKey
-							recurrent:NO
-				additionalPaymentData:paymentData
-						  receiptData:receiptData
-							shopsData:shopsData
-					shopsReceiptsData:shopsReceiptsData
-							 location:ASDKLocalized.sharedInstance.localeIdentifier
-	 success:^(ASDKInitResponse *response) {
-		 [self.acquiringSdk chargeWithPaymentId:response.paymentId rebillId:rebillId success:^(ASDKPaymentInfo *paymentInfo, ASDKPaymentStatus status) {
-			 [ASDKPaymentFormStarter resetSharedInstance];
-			 onSuccess(paymentInfo);
-		 } failure:^(ASDKAcquringSdkError *error) {
-			 ASDKAcquiringResponse *errorResponse = [error.userInfo objectForKey:@"acquringResponse"];
-			 //пользователю необходимо подтвердить платеж через ввод cvc ASDK-432
-			 //ErrorCode == 104
-			 if ([[errorResponse.dictionary objectForKey:@"ErrorCode"] integerValue] == 104)
-			 {
-				 [[ASDKCardsListDataController cardsListDataControllerWithAcquiringSdk:self.acquiringSdk customerKey:customerKey] updateCardsListWithSuccessBlock:^{
-					 ASDKCard *selectedCard = [[ASDKCardsListDataController instance] cardByRebillId:rebillId];
-					 if (selectedCard != nil)
-					 {
-						[self prepareDesign];
-
-						 ASDKPaymentFormViewController *vc = [[ASDKPaymentFormViewController alloc] initWithAmount:amount
-																										   orderId:orderId
-																											 title:nil
-																									   description:description
-																											cardId:selectedCard.cardId
-																											 email:nil
-																									   customerKey:customerKey
-																										 recurrent:NO
-																										makeCharge:YES
-																							 additionalPaymentData:paymentData
-																									   receiptData:receiptData
-																										 shopsData:shopsData
-																								 shopsReceiptsData:shopsReceiptsData
-																										   success:^(ASDKPaymentInfo *paymentInfo)
-															  {
-																  [ASDKPaymentFormStarter resetSharedInstance];
-
-																  onSuccess(paymentInfo);
-															  }
-																										 cancelled:^
-															  {
-																  [ASDKPaymentFormStarter resetSharedInstance];
-
-																  onError(nil);
-															  }
-																											 error:^(ASDKAcquringSdkError *error)
-															  {
-																  [ASDKPaymentFormStarter resetSharedInstance];
-
-																  onError(error);
-															  }];
-
-						 vc.acquiringSdk = self.acquiringSdk;
-						 [ASDKCardsListDataController cardsListDataControllerWithAcquiringSdk:self.acquiringSdk customerKey:customerKey];
-						 [vc setChargeError:YES];
-						 [vc setChargeErrorPaymentId:[errorResponse.dictionary objectForKey:@"PaymentId"]];
-						 [vc needSetupCardRequisitesCellForCVC];
-                         
-                         ASDKNavigationController *nc = [[ASDKNavigationController alloc] initWithRootViewController:vc];
-                         [nc setModalPresentationStyle:self.designConfiguration.modalPresentationStyle];
-                         
-						 if (paymentConfirm)
-						 {
-							 paymentConfirm(nc);
-						 }
-					 }
-				 } errorBlock:^(ASDKAcquringSdkError *error) {
-					 [ASDKPaymentFormStarter resetSharedInstance];
-					 onError(error);
-				 }];
-			 }
-			 else
-			 {
-				 [ASDKPaymentFormStarter resetSharedInstance];
-				 onError(error);
-			 }
-		 }];
-	 } failure:^(ASDKAcquringSdkError *error) {
-		 onError(error);
-	 }];
+    [self.acquiringSdk initWithAmount:[NSNumber numberWithDouble:100 * amount.doubleValue]
+                              orderId:orderId
+                          description:description
+                              payForm:nil
+                          customerKey:customerKey
+                            recurrent:NO
+                additionalPaymentData:paymentData
+                          receiptData:receiptData
+                            shopsData:shopsData
+                    shopsReceiptsData:shopsReceiptsData
+                             location:ASDKLocalized.sharedInstance.localeIdentifier
+                              success:^(ASDKInitResponse *response) {
+        [self.acquiringSdk chargeWithPaymentId:response.paymentId rebillId:rebillId success:^(ASDKPaymentInfo *paymentInfo, ASDKPaymentStatus status) {
+            [ASDKPaymentFormStarter resetSharedInstance];
+            if (onSuccess != nil)
+            {
+                onSuccess(paymentInfo);
+            }
+        } failure:^(ASDKAcquringSdkError *error) {
+            ASDKAcquiringResponse *errorResponse = [error.userInfo objectForKey:@"acquringResponse"];
+            //пользователю необходимо подтвердить платеж через ввод cvc ASDK-432
+            //ErrorCode == 104
+            if ([[errorResponse.dictionary objectForKey:@"ErrorCode"] integerValue] == 104)
+            {
+                [[ASDKCardsListDataController cardsListDataControllerWithAcquiringSdk:self.acquiringSdk customerKey:customerKey] updateCardsListWithSuccessBlock:^{
+                    ASDKCard *selectedCard = [[ASDKCardsListDataController instance] cardByRebillId:rebillId];
+                    if (selectedCard != nil)
+                    {
+                        [self prepareDesign];
+                        
+                        ASDKPaymentFormViewController *vc = [
+                                                             [ASDKPaymentFormViewController alloc]
+                                                             initWithAmount:amount
+                                                             orderId:orderId
+                                                             title:nil
+                                                             description:description
+                                                             cardId:selectedCard.cardId
+                                                             email:nil
+                                                             customerKey:customerKey
+                                                             recurrent:NO
+                                                             makeCharge:YES
+                                                             additionalPaymentData:paymentData
+                                                             receiptData:receiptData
+                                                             shopsData:shopsData
+                                                             shopsReceiptsData:shopsReceiptsData
+                                                             success:^(ASDKPaymentInfo *paymentInfo)
+                                                             {
+                            [ASDKPaymentFormStarter resetSharedInstance];
+                            if (onSuccess != nil)
+                            {
+                                onSuccess(paymentInfo);
+                            }
+                        }
+                                                             cancelled:^
+                                                             {
+                            [ASDKPaymentFormStarter resetSharedInstance];
+                            if (onError != nil)
+                            {
+                                onError(nil);
+                            }
+                        }
+                                                             error:^(ASDKAcquringSdkError *error)
+                                                             {
+                            [ASDKPaymentFormStarter resetSharedInstance];
+                            if (onError != nil)
+                            {
+                                onError(error);
+                            }
+                        }];
+                        
+                        vc.acquiringSdk = self.acquiringSdk;
+                        [ASDKCardsListDataController cardsListDataControllerWithAcquiringSdk:self.acquiringSdk customerKey:customerKey];
+                        [vc setChargeError:YES];
+                        [vc setChargeErrorPaymentId:[errorResponse.dictionary objectForKey:@"PaymentId"]];
+                        [vc needSetupCardRequisitesCellForCVC];
+                        
+                        ASDKNavigationController *nc = [[ASDKNavigationController alloc] initWithRootViewController:vc];
+                        [nc setModalPresentationStyle:self.designConfiguration.modalPresentationStyle];
+                        
+                        if (paymentConfirm)
+                        {
+                            paymentConfirm(nc);
+                        }
+                    }
+                } errorBlock:^(ASDKAcquringSdkError *error) {
+                    [ASDKPaymentFormStarter resetSharedInstance];
+                    if (onError != nil)
+                    {
+                        onError(error);
+                    }
+                }];
+            }
+            else
+            {
+                [ASDKPaymentFormStarter resetSharedInstance];
+                if (onError != nil)
+                {
+                    onError(error);
+                }
+            }
+        }];
+    } failure:^(ASDKAcquringSdkError *error) {
+        if (onError != nil)
+        {
+            onError(error);
+        }
+    }
+     ];
 }
 
 #pragma mark - PKPaymentAuthorizationViewControllerDelegate
@@ -656,21 +702,27 @@ - (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController
 - (void)paymentAuthorizationViewControllerDidFinish:(PKPaymentAuthorizationViewController *)controller
 {
 	[controller dismissViewControllerAnimated:YES completion:^{
-		if (self.onCompleteSuccessPaymentInfo != nil && self.onCompleteError == nil && (self.onCompleteStatus == ASDKPaymentStatus_CONFIRMED || self.onCompleteStatus == ASDKPaymentStatus_AUTHORIZED))
+		if (self.onCompleteSuccessPaymentInfo != nil
+            && self.onCompleteError == nil
+            && (self.onCompleteStatus == ASDKPaymentStatus_CONFIRMED || self.onCompleteStatus == ASDKPaymentStatus_AUTHORIZED)
+            && self.onSuccess != nil)
 		{
 			self.onSuccess(self.onCompleteSuccessPaymentInfo);
 			self.onCompleteSuccessPaymentInfo = nil;
 		}
-		else if (self.onCompleteSuccessPaymentInfo == nil && self.onCompleteError == nil)
+		else if (self.onCompleteSuccessPaymentInfo == nil
+                 && self.onCompleteError == nil
+                 && self.onCancelled != nil)
 		{
 			self.onCancelled();
 		}
-		else if (self.onCompleteError != nil)
+		else if (self.onCompleteError != nil
+                 && self.onError != nil)
 		{
 			self.onError(self.onCompleteError);
 			self.onCompleteError = nil;
 		}
-		else
+		else if (self.onError != nil)
 		{
 			NSString *details = [NSString stringWithFormat:@"%@", self.onCompleteSuccessPaymentInfo];
 			ASDKAcquringSdkError *error = [ASDKAcquringSdkError errorWithMessage:nil details:details code:0];
@@ -699,23 +751,35 @@ - (void)presentAttachFormFromViewController:(UIViewController *)presentingViewCo
     
     //    ASDKLoopViewController *viewController = [[ASDKLoopViewController alloc] initWithAddCardRequestKey:@"1" acquiringSdk:self.acquiringSdk];
     
-    ASDKAttachCardViewController *viewController = [[ASDKAttachCardViewController alloc] initWithCardCheckType:cardCheckType
-                                                                                                     formTitle:(NSString *)title
-                                                                                                    formHeader:(NSString *)header
-                                                                                                   description:(NSString *)description
-                                                                                                         email:(NSString *)email
-                                                                                                   customerKey:(NSString *)customerKey
-                                                                                                additionalData:(NSDictionary *)data
-                                                                                                       success:^(ASDKResponseAttachCard *result) {
-                                                                                                           [ASDKPaymentFormStarter resetSharedInstance];
-                                                                                                           onSuccess(result);
-                                                                                                       } cancelled:^{
-                                                                                                           [ASDKPaymentFormStarter resetSharedInstance];
-                                                                                                           onCancelled();
-                                                                                                       } error:^(ASDKAcquringSdkError *error) {
-                                                                                                           [ASDKPaymentFormStarter resetSharedInstance];
-                                                                                                           onError(error);
-                                                                                                       }];
+    ASDKAttachCardViewController *viewController = [
+                                                    [ASDKAttachCardViewController alloc]
+                                                    initWithCardCheckType:cardCheckType
+                                                    formTitle:(NSString *)title
+                                                    formHeader:(NSString *)header
+                                                    description:(NSString *)description
+                                                    email:(NSString *)email
+                                                    customerKey:(NSString *)customerKey
+                                                    additionalData:(NSDictionary *)data
+                                                    success:^(ASDKResponseAttachCard *result) {
+        [ASDKPaymentFormStarter resetSharedInstance];
+        if (onSuccess != nil)
+        {
+            onSuccess(result);
+        }
+    } cancelled:^{
+        [ASDKPaymentFormStarter resetSharedInstance];
+        if (onCancelled != nil)
+        {
+            onCancelled();
+        }
+    } error:^(ASDKAcquringSdkError *error) {
+        [ASDKPaymentFormStarter resetSharedInstance];
+        if (onError != nil)
+        {
+            onError(error);
+        }
+    }
+                                                    ];
     viewController.isDissmissAfterCompletion = isDissmissAfterCompletion;
     
     viewController.acquiringSdk = self.acquiringSdk;
@@ -723,7 +787,10 @@ - (void)presentAttachFormFromViewController:(UIViewController *)presentingViewCo
     ASDKNavigationController *nc = [[ASDKNavigationController alloc] initWithRootViewController:viewController];
     [nc setModalPresentationStyle:self.designConfiguration.modalPresentationStyle];
     [ASDKCardsListDataController cardsListDataControllerWithAcquiringSdk:self.acquiringSdk customerKey:customerKey];
-    [presentingViewController presentViewController:nc animated:YES completion:nil];
+    [presentingViewController presentViewController:nc
+                                           animated:self.designConfiguration.shouldAnimate
+                                         completion:self.designConfiguration.getPresentationCompletion
+     ];
 }
 
 - (void)presentAttachFormFromViewController:(UIViewController *)presentingViewController
diff --git a/ASDKUI/Resources/ASDKUIImages.xcassets/buttom_logos.imageset/buttom_logos-1.pdf b/ASDKUI/Resources/ASDKUIImages.xcassets/buttom_logos.imageset/buttom_logos-1.pdf
new file mode 100644
index 0000000..c6a7861
Binary files /dev/null and b/ASDKUI/Resources/ASDKUIImages.xcassets/buttom_logos.imageset/buttom_logos-1.pdf differ