diff --git a/edivorce/apps/core/static/js/functions.js b/edivorce/apps/core/static/js/functions.js
index 846ada0c..fadac594 100644
--- a/edivorce/apps/core/static/js/functions.js
+++ b/edivorce/apps/core/static/js/functions.js
@@ -70,9 +70,22 @@ var showHideTargetId = function(el, id, related_id) {
             $('#' + related_id).show();
         }
 
-        if (id === "#annual_gross_income") {
-            reveal($("input[name=agree_to_child_support_amount]:checked"));
-        }
+        var revealCheckboxes = [
+            {
+                matchIdSelector: "#annual_gross_income",
+                radioSelector: "input[name=agree_to_child_support_amount]:checked"
+            },
+            {
+                matchIdSelector: "#spouse_annual_gross_income",
+                radioSelector: "input[name=spouse_agree_to_child_support_amount]:checked"
+            }
+        ];
+
+        revealCheckboxes.forEach(function(option) {
+           if (id === option.matchIdSelector) {
+               reveal($(option.radioSelector));
+           }
+        });
     }
 };
 
diff --git a/edivorce/apps/core/templates/question/06_children_income_expenses.html b/edivorce/apps/core/templates/question/06_children_income_expenses.html
index 64ce1d5d..54dbd753 100644
--- a/edivorce/apps/core/templates/question/06_children_income_expenses.html
+++ b/edivorce/apps/core/templates/question/06_children_income_expenses.html
@@ -39,7 +39,7 @@
             ?
         </h3>
         <div class="dollar-prefix">
-            {% money_input_field name="annual_gross_income" value="" class="money" data_target_id="annual_gross_income" data_related_id="fact_sheet_f" data_reveal_target="true" data_reveal_condition=">150000" %}
+            {% money_input_field name="annual_gross_income" value="" class="money" data_target_id="annual_gross_income" data_related_id="you_fact_sheet_f" data_reveal_target="true" data_reveal_condition=">150000" %}
         </div>
 
         <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
@@ -97,7 +97,7 @@
         </div>
     </div>
 
-    <div class="question-well" id="fact_sheet_f" hidden>
+    <div class="question-well" id="you_fact_sheet_f" hidden>
     <h1>Fact Sheet F Income over $150,000</h1>
     <table class="table table-bordered">
         <thead>
@@ -237,6 +237,228 @@
     </div>
 </div>
 
+    <div class="question-well">
+        <h3>What is your spouse's
+            <span class="tooltip-link"
+                  data-toggle="tooltip" data-placement="right" data-html="true"
+                  title="
+                    <b>Annual Gross Income Definition</b>
+                    <p>
+                        The Federal Guidelines use gross income (a person’s income before taxes and deductions)
+                         because it is considered a fairer reflection of income. Net income allows many
+                         discretionary deductions that can make it difficult to set fair support. Also, the child
+                         support amounts found in the federal tables already account for taxes.
+                     </p>
+                     <p>
+                     Source:
+                     <a href='http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-2.html#h-6' target='_blank'>Federal Child Support Guidelines</a>, Department of Justice
+                     </p>
+                    ">
+                    annual gross income <i class="fa fa-question-circle" aria-hidden="true"></i>
+            </span>
+            as per the
+            <a href="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-2.html#h-6" target="_blank">
+                Federal Child Support Guidelines</a>
+            ?
+        </h3>
+        <div class="dollar-prefix">
+            {% money_input_field name="spouse_annual_gross_income" value="" class="money" data_target_id="spouse_annual_gross_income" data_related_id="spouse_fact_sheet_f" data_reveal_target="true" data_reveal_condition=">150000" %}
+        </div>
+
+        <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
+             data-target="#collapseSpouseFedGuidelines" aria-controls="collapseSpouseFedGuidelines">
+            <div>
+                What are the  Federal Child Support Guidelines?
+            </div>
+        </div>
+        <div class="collapse" id="collapseSpouseFedGuidelines">
+            <div>
+                <p>
+                    The Federal Guidelines are a set of rules and tables used to determine child support when parents
+                    divorce. They are the law. Their main goals are:
+                </p>
+                <ul>
+                    <li>
+                        to establish a fair standard of support for children so that they continue to benefit from both
+                        parents’ incomes after the separation or divorce;
+                    </li>
+                    <li>
+                        to reduce conflict and tension between parents by making the calculation of child support more
+                        objective;
+                    </li>
+                    <li>
+                        to ensure that parents and children in similar situations are treated the same; and
+                    </li>
+                    <li>
+                        to make the legal process more efficient and encourage settlements by giving courts and parents guidance about child support.
+                    </li>
+                </ul>
+                <p>
+                    Source:
+                    {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h12" link_text="Federal Child Support Guidelines" %}
+                    , Department of Justice
+                </p>
+            </div>
+        </div>
+
+        <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false"
+             data-target="#collapseSpouseIncome" aria-controls="collapseSpouseIncome">
+            <div>
+                 How do I calculate my spouse's annual income?
+            </div>
+        </div>
+        <div class="collapse" id="collapseSpouseIncome">
+            <div>
+                <p>
+                    A spouse’s annual income is determined using the sources of income set out under the heading
+                    “Total income” in the T1 General form issued by the Canada Revenue Agency and is adjusted in
+                    accordance with Schedule III.
+                </p>
+            </div>
+        </div>
+
+    <div class="question-well" id="spouse_fact_sheet_f" hidden>
+    <h1>Fact Sheet F Income over $150,000</h1>
+    <table class="table table-bordered">
+        <thead>
+            <tr>
+                <th></th>
+                <th>Amount</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td class="fact-sheet-question">
+                    How many child(ren) are you asking for support?
+                </td>
+                <td class="fact-sheet-answer">
+                    {% input_field type="number" name="spouse_number_children_seeking_support" class="fact-sheet-input" %}
+                </td>
+            </tr>
+            <tr>
+                <td class="fact-sheet-question">
+                    <p>
+                        What is the
+                        {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h11" link_text="Child Support Guidelines" %}
+                        amount for $150,000?
+                    </p>
+                    {% include "partials/inline_question_determine_amount_to_pay.html" with collapse_target_id="collapse_spouse_guideline_amount" %}
+                </td>
+                <td class="fact-sheet-answer">
+                    {% input_field type="number" name="spouse_child_support_amount_under_high_income" class="fact-sheet-input spouse-guideline-amount" data_sum="true" data_sum_class="spouse-guideline-amount" data_sum_target_id="spouse_total_amount" %}
+                </td>
+            </tr>
+            <tr>
+                <td class="fact-sheet-question">
+                    What is the % of income over $150,000 from the
+                    {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h11" link_text="Child Support Guidelines" %}
+                    ?
+                </td>
+                <td class="fact-sheet-answer">
+                    {% input_field type="number" name="spouse_percent_income_over_high_income_limit" class="fact-sheet-input" %}
+                </td>
+            </tr>
+            <tr>
+                <td class="fact-sheet-question">
+                    <p>
+                        What is the child support amount to be paid on the portion of income over $150,000?
+                    </p>
+                    <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_spouse_high_income_amounts" aria-controls="collapse_spouse_high_income_amounts">
+                        <div>
+                            How can I determine this amount?
+                        </div>
+                    </div>
+                    <div class="collapse" id="collapse_spouse_high_income_amounts">
+                        <div>
+                            <p>
+                                The child support tables only show an amount for the first $150,000 of income. You have
+                                two choices for determining how much child support should be paid on the portion of
+                                income over $150,000:
+                            </p>
+                            <ul>
+                                <li>
+                                    you can multiply the amount of income over $150,000 by the percentage shown in the
+                                    table for the province or territory where the paying parent lives; or
+                                </li>
+                                <li>
+                                    you can agree on an additional amount of support based on the condition, means,
+                                    needs and other circumstances of your children and your financial ability to
+                                    contribute.
+                                </li>
+                            </ul>
+                            <p>
+                                To speak to someone in person, you can call the Department of Justice Canada's Family
+                                Law Information Line at 1-888-373-2222. When you call, be ready to tell them:
+                            </p>
+                            <ul>
+                                <li>Where the paying parent lives</li>
+                                <li>Whether both parents live in the same province or territory, and</li>
+                                <li>The number of children to be supported</li>
+                            </ul>
+                            <p>
+                                Source:
+                                {% include "partials/tooltip_link_federal_child_support_guidelines.html" with reference_link="http://www.justice.gc.ca/eng/rp-pr/fl-lf/child-enfant/guide/start-com.html#h11" link_text="Federal Child Support Guidelines" %}
+                                , Department of Justice
+                            </p>
+                        </div>
+                    </div>
+                </td>
+                <td class="fact-sheet-answer">
+                    {% input_field type="number" name="spouse_amount_income_over_high_income_limit" class="fact-sheet-input spouse-guideline-amount" data_sum="true" data_sum_class="spouse-guideline-amount" data_sum_target_id="spouse_total_amount" %}
+                </td>
+            </tr>
+            <tr>
+                <td class="fact-sheet-question">
+                    Guidelines table amount
+                </td>
+                <td class="fact-sheet-answer" readonly>
+                    {% input_field type="number" name="spouse_total_guideline_amount" id="spouse_total_amount" class="fact-sheet-input" readonly="" data_mirror="true" data_mirror_target="#spouse_agreed_total_amount" data_mirror_broadcast_change="true"%}
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    <div class="question-well">
+        <p>
+            Do you and your spouse agree that $<span id="spouse_agreed_total_amount">{{ spouse_total_guideline_amount }}</span> is the child support amount?
+        </p>
+        <div class="btn-radio-group" data-toggle="buttons">
+            <label class="btn btn-radio">
+                {% input_field type="radio" name="spouse_agree_to_child_support_amount" autocomplete="off" value="YES" data_target_id="spouse_enter_agreed_appropriate_amount"  data_reveal_target="false" %} YES
+            </label>
+
+            <label class="btn btn-radio">
+                {% input_field type="radio" name="spouse_agree_to_child_support_amount" autocomplete="off" value="NO" data_target_id="spouse_enter_agreed_appropriate_amount"  data_reveal_target="true" %} NO
+            </label>
+        </div>
+        <div id="spouse_enter_agreed_appropriate_amount" hidden>
+            <p>
+                What is the amount that you and your spouse have agreed to?
+            </p>
+            <p>
+                That differs from the Child Support Guidelines table amount
+            </p>
+            <div>
+                <div class="dollar-prefix">
+                    {% money_input_field name="spouse_agreed_child_support_amount" value="" class="fact-sheet-input money" %}
+                </div>
+            </div>
+            <p>
+                Why do you think the court should approve your proposed amount?
+            </p>
+            <p>
+                Discuss the conditions, means, needs and other circumstances of the child, and the financial ability of
+                each parent to support the child/children.
+            </p>
+            <div>
+                {% input_field type="textarea" name="spouse_reason_child_support_amount" class="fact-sheet-input form-control response-textarea" maxlength="1000" rows="6"%}
+            </div>
+        </div>
+    </div>
+</div>
+
+
+    </div>
 {% endblock %}
 
 
diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py
index d1f6c58f..fa181e25 100644
--- a/edivorce/apps/core/utils/question_step_mapping.py
+++ b/edivorce/apps/core/utils/question_step_mapping.py
@@ -39,6 +39,24 @@ question_step_mapping = {
                       'order_respecting_arrangement',
                       'order_for_child_support',
                       'child_support_act',
+                      'annual_gross_income',
+                      'number_children_seeking_support',
+                      'child_support_amount_under_high_income',
+                      'percent_income_over_high_income_limit',
+                      'amount_income_over_high_income_limit',
+                      'total_guideline_amount',
+                      'agree_to_child_support_amount',
+                      'agreed_child_support_amount',
+                      'reason_child_support_amount',
+                      'spouse_annual_gross_income',
+                      'spouse_number_children_seeking_support',
+                      'spouse_child_support_amount_under_high_income',
+                      'spouse_percent_income_over_high_income_limit',
+                      'spouse_amount_income_over_high_income_limit',
+                      'spouse_total_guideline_amount',
+                      'spouse_agree_to_child_support_amount',
+                      'spouse_agreed_child_support_amount',
+                      'spouse_reason_child_support_amount'
                       ],
     'spousal_support': ['spouse_support_details', 'spouse_support_act'],
     'property_and_debt': ['deal_with_property_debt',
diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json
index 58352fe4..3c8a738f 100644
--- a/edivorce/fixtures/Question.json
+++ b/edivorce/fixtures/Question.json
@@ -962,5 +962,112 @@
     },
     "model": "core.question",
     "pk": "reason_child_support_amount"
+},
+{
+    "fields": {
+        "name": "What is your spouse's annual gross income as per the Federal Child Support Guidelines?",
+        "description": "For Step 6, Your children - Income & expenses",
+        "summary_order": 0,
+        "required": "Required"
+    },
+    "model": "core.question",
+    "pk": "spouse_annual_gross_income"
+},
+{
+    "fields": {
+        "name": "How many child(ren) are you asking for support?",
+        "description": "Fact Sheet F",
+        "summary_order": 0,
+        "required": "Conditional",
+        "conditional_target": "spouse_annual_gross_income",
+        "reveal_response": ">150000"
+    },
+    "model": "core.question",
+    "pk": "spouse_number_children_seeking_support"
+},
+{
+    "fields": {
+        "name": "What is the Child Support Guidelines amount for $150,000?",
+        "description": "Fact Sheet F",
+        "summary_order": 0,
+        "required": "Conditional",
+        "conditional_target": "spouse_annual_gross_income",
+        "reveal_response": ">150000"
+    },
+    "model": "core.question",
+    "pk": "spouse_child_support_amount_under_high_income"
+},
+{
+    "fields": {
+        "name": "What is the % of income over $150,000 from the Child Support Guidlines?",
+        "description": "Fact Sheet F",
+        "summary_order": 0,
+        "required": "Conditional",
+        "conditional_target": "spouse_annual_gross_income",
+        "reveal_response": ">150000"
+    },
+    "model": "core.question",
+    "pk": "spouse_percent_income_over_high_income_limit"
+},
+{
+    "fields": {
+        "name": "What is the child support amount to be paid on the portion of income over $150,000?",
+        "description": "Fact Sheet F",
+        "summary_order": 0,
+        "required": "Conditional",
+        "conditional_target": "spouse_annual_gross_income",
+        "reveal_response": ">150000"
+    },
+    "model": "core.question",
+    "pk": "spouse_amount_income_over_high_income_limit"
+},
+{
+    "fields": {
+        "name": "Guidelines table amount",
+        "description": "Fact Sheet F",
+        "summary_order": 0,
+        "required": "Conditional",
+        "conditional_target": "spouse_annual_gross_income",
+        "reveal_response": ">150000"
+    },
+    "model": "core.question",
+    "pk": "spouse_total_guideline_amount"
+},
+{
+    "fields": {
+        "name": "What is the amount that you and your spouse have agreed to?",
+        "description": "Fact Sheet F",
+        "summary_order": 0,
+        "required": "Conditional",
+        "conditional_target": "spouse_annual_gross_income",
+        "reveal_response": ">150000"
+    },
+    "model": "core.question",
+    "pk": "spouse_agree_to_child_support_amount"
+},
+{
+    "fields": {
+        "name": "What is the amount that you and your spouse have agreed to?",
+        "description": "Fact Sheet F",
+        "summary_order": 0,
+        "required": "Conditional",
+        "conditional_target": "spouse_agree_to_child_support_amount",
+        "reveal_response": "NO"
+    },
+    "model": "core.question",
+    "pk": "spouse_agreed_child_support_amount"
+},
+{
+    "fields": {
+        "name": "Why do you think the court should approve your proposed amount?",
+        "description": "Fact Sheet F",
+        "summary_order": 0,
+        "required": "Conditional",
+        "conditional_target": "spouse_agree_to_child_support_amount",
+        "reveal_response": "NO"
+    },
+    "model": "core.question",
+    "pk": "spouse_reason_child_support_amount"
 }
+
 ]