Ecomdev Checkitout compatibility with SagePay SUITE

diff --git app/design/frontend/base/default/layout/sagepaysuite_checkout_review.xml app/design/frontend/base/default/layout/sagepaysuite_checkout_review.xml
index 9d1451e..35e7e0e 100644
--- app/design/frontend/base/default/layout/sagepaysuite_checkout_review.xml
+++ app/design/frontend/base/default/layout/sagepaysuite_checkout_review.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <layout version="0.1.0">

-   <checkout_onepage_review>
+<!--   <checkout_onepage_review>
        <reference name="root">
            <action method="setTemplate">
                <template>sagepaysuite/checkout/review/info.phtml</template>
            </action>
        </reference>
    </checkout_onepage_review>
-
+-->
 </layout>
\ No newline at end of file
diff --git skin/frontend/base/default/sagepaysuite/js/sagePaySuite_Checkout.js skin/frontend/base/default/sagepaysuite/js/sagePaySuite_Checkout.js
index df15efb..9a6260c 100644
--- skin/frontend/base/default/sagepaysuite/js/sagePaySuite_Checkout.js
+++ skin/frontend/base/default/sagepaysuite/js/sagePaySuite_Checkout.js
@@ -624,8 +624,9 @@ try{
    $(document.body).insert(new Element('a', { 'id': 'sagepaydirectpro-dummy-link', 'href': '#', 'style':'display:none' }).update('&nbsp;'));

    var msCont = $('suite_ms_payment_method');
-
-       if( !msCont && (SuiteConfig.getConfig('global', 'ajax_review') == '2') && ((typeof window.review) != 'undefined') ){
+    // Is OnePageCheckout flag
+    var isOpc = !msCont && typeof checkout !== 'undefined' && typeof billing !== 'undefined' && typeof payment !== 'undefined';
+       if(isOpc &&  (SuiteConfig.getConfig('global', 'ajax_review') == '2') && ((typeof window.review) != 'undefined') ){
            var SageServer = new EbizmartsSagePaySuite.Checkout(
                    {
                            'checkout':             window.checkout,
@@ -635,7 +636,31 @@ try{
                            'accordion':            window.accordion
                    }
            );
-        }else if(!msCont && ($$('div.shopping-cart-totals').length != 1) && $('onestepcheckout-form')){
+        } else if (isOpc && ((typeof window.review) === 'undefined')) {
+            // This condition performs check for review object that is loaded within AJAX call
+            // instead of window on load
+            var ServerCreator = {
+                review: false,
+                onCreate: function() {
+                   this.review = window.review; // Retrieves current review object
+                },
+                onComplete: function () {
+                    if (this.review !== window.review) {
+                        // Compares current review object to window object
+                        // and creates instance of SagePaySuite checkout if they different
+                        window.SageServer = new EbizmartsSagePaySuite.Checkout({
+                            'checkout':             window.checkout,
+                            'review':               window.review,
+                            'payment':              window.payment,
+                            'billing':              window.billing,
+                            'accordion':            window.accordion
+                        });
+                    }
+                }
+            };
+            // Register server creator for checking availability of review object
+            Ajax.Responders.register(ServerCreator);
+        } else if(!msCont && ($$('div.shopping-cart-totals').length != 1) && $('onestepcheckout-form')){
            var SageServer = new EbizmartsSagePaySuite.Checkout(
                    {
                            'osc': $('onestepcheckout-place-order'),
@@ -643,7 +668,7 @@ try{
                    }
            );

-        }else if(msCont && (msCont.getValue() == 'sagepayserver')){
+        } else if(msCont && (msCont.getValue() == 'sagepayserver')){
            var SageServer = new EbizmartsSagePaySuite.Checkout(
                    {
                        'msform': $$('div.multiple-checkout')[0].down(2)