diff --git a/revenue_trends.dashboard.lookml b/revenue_trends.dashboard.lookml
index 42d0d63..de5d8f6 100644
--- a/revenue_trends.dashboard.lookml
+++ b/revenue_trends.dashboard.lookml
@@ -268,1112 +268,1112 @@
     col: 3
     width: 7
     height: 3
-  # - title: MTD
-  #   name: MTD
-  #   model: cloud_sales_bi
-  #   explore: revenue
-  #   type: single_value
-  #   fields: [revenue.month_to_date, revenue.revenue_toggle]
-  #   filters:
-  #     revenue.product_line: "-Looker,-Looker Data Platform SaaS"
-  #     revenue.month_to_date: "-NULL"
-  #     revenue.usage_month: 3 months
-  #     revenue.metric_selector: blended
-  #   sorts: [revenue.month_to_date desc]
-  #   limit: 500
-  #   dynamic_fields: [{category: table_calculation, expression: "(${revenue.revenue_toggle}-offset(${revenue.revenue_toggle},1))/offset(${revenue.revenue_toggle},1)",
-  #       label: MoM %, value_format: !!null '', value_format_name: percent_0, _kind_hint: measure,
-  #       table_calculation: mom, _type_hint: number}]
-  #   query_timezone: America/Los_Angeles
-  #   custom_color_enabled: true
-  #   show_single_value_title: true
-  #   show_comparison: true
-  #   comparison_type: change
-  #   comparison_reverse_colors: false
-  #   show_comparison_label: true
-  #   enable_conditional_formatting: false
-  #   conditional_formatting_include_totals: false
-  #   conditional_formatting_include_nulls: false
-  #   x_axis_gridlines: false
-  #   y_axis_gridlines: true
-  #   show_view_names: false
-  #   y_axes: [{label: '', orientation: left, series: [{axisId: revenue.revenue_net_cn,
-  #           id: revenue.revenue_net_cn, name: 'Revenue (Net, Channel Neutral)'}],
-  #       showLabels: true, showValues: true, unpinAxis: true, tickDensity: default,
-  #       tickDensityCustom: 5, type: linear}]
-  #   show_y_axis_labels: true
-  #   show_y_axis_ticks: true
-  #   y_axis_tick_density: default
-  #   y_axis_tick_density_custom: 5
-  #   show_x_axis_label: true
-  #   show_x_axis_ticks: true
-  #   y_axis_scale_mode: linear
-  #   x_axis_reversed: false
-  #   y_axis_reversed: false
-  #   plot_size_by_field: false
-  #   trellis: ''
-  #   stacking: normal
-  #   limit_displayed_rows: false
-  #   legend_position: center
-  #   series_types: {}
-  #   point_style: none
-  #   show_value_labels: true
-  #   label_density: 25
-  #   x_axis_scale: auto
-  #   y_axis_combined: true
-  #   show_null_points: true
-  #   interpolation: linear
-  #   ordering: none
-  #   show_null_labels: false
-  #   show_totals_labels: false
-  #   show_silhouette: false
-  #   totals_color: "#808080"
-  #   defaults_version: 1
-  #   hidden_fields: []
-  #   note_state: collapsed
-  #   note_display: hover
-  #   note_text: Based on Sales Revenue
-  #   listen:
-  #     SFDC Account ID: revenue.sfdc_account_id
-  #     Product Group: revenue.product_group
-  #     GCP Revenue Source: revenue.gcp_revenue_source
-  #     Billing Account ID: revenue.billing_account_id
-  #     Logical Product (L3): revenue.logical_product_l3
-  #     SKU ID: revenue.sku_id
-  #     Sub-Account Name: vector_customers.account_name
-  #     Is Data Analytics? (Yes / No): revenue.is_data_analytics
-  #     Revenue Granularity: revenue.revenue_granularity
-  #     Region: revenue.region
-  #     EMEA Geocluster: revenue.geocluster
-  #     NORTHAM Sector: revenue.sector
-  #     Sub Region: revenue.sub_region
-  #     Micro Region: revenue.micro_region
-  #     NAL Cluster: revenue.nal_cluster
-  #     NAL Subcluster: vector_customers.nal_sub_cluster
-  #     NAL Name: revenue.nal_name
-  #     Reporting Account Name: revenue.reporting_account_name
-  #     Segment: revenue.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
-  #     Is ISV? (Yes / No): vector_customers.is_isv
-  #   row: 7
-  #   col: 17
-  #   width: 7
-  #   height: 3
-  # - title: QTD
-  #   name: QTD
-  #   model: cloud_sales_bi
-  #   explore: revenue
-  #   type: single_value
-  #   fields: [revenue.quarter_to_date, revenue.revenue_toggle]
-  #   filters:
-  #     revenue.product_line: "-Looker,-Looker Data Platform SaaS"
-  #     revenue.usage_month: 3 quarters
-  #     revenue.quarter_to_date: "-NULL"
-  #     revenue.metric_selector: blended
-  #   sorts: [revenue.quarter_to_date desc]
-  #   limit: 500
-  #   dynamic_fields: [{category: table_calculation, expression: "(${revenue.revenue_toggle}-offset(${revenue.revenue_toggle},1))/offset(${revenue.revenue_toggle},1)",
-  #       label: QoQ %, value_format: !!null '', value_format_name: percent_0, _kind_hint: measure,
-  #       table_calculation: qoq, _type_hint: number}]
-  #   query_timezone: America/Los_Angeles
-  #   custom_color_enabled: true
-  #   show_single_value_title: true
-  #   show_comparison: true
-  #   comparison_type: change
-  #   comparison_reverse_colors: false
-  #   show_comparison_label: true
-  #   enable_conditional_formatting: false
-  #   conditional_formatting_include_totals: false
-  #   conditional_formatting_include_nulls: false
-  #   x_axis_gridlines: false
-  #   y_axis_gridlines: true
-  #   show_view_names: false
-  #   y_axes: [{label: '', orientation: left, series: [{axisId: revenue.revenue_net_cn,
-  #           id: revenue.revenue_net_cn, name: 'Revenue (Net, Channel Neutral)'}],
-  #       showLabels: true, showValues: true, unpinAxis: true, tickDensity: default,
-  #       tickDensityCustom: 5, type: linear}]
-  #   show_y_axis_labels: true
-  #   show_y_axis_ticks: true
-  #   y_axis_tick_density: default
-  #   y_axis_tick_density_custom: 5
-  #   show_x_axis_label: true
-  #   show_x_axis_ticks: true
-  #   y_axis_scale_mode: linear
-  #   x_axis_reversed: false
-  #   y_axis_reversed: false
-  #   plot_size_by_field: false
-  #   trellis: ''
-  #   stacking: normal
-  #   limit_displayed_rows: false
-  #   legend_position: center
-  #   series_types: {}
-  #   point_style: none
-  #   show_value_labels: true
-  #   label_density: 25
-  #   x_axis_scale: auto
-  #   y_axis_combined: true
-  #   show_null_points: true
-  #   interpolation: linear
-  #   ordering: none
-  #   show_null_labels: false
-  #   show_totals_labels: false
-  #   show_silhouette: false
-  #   totals_color: "#808080"
-  #   defaults_version: 1
-  #   hidden_fields: []
-  #   note_state: collapsed
-  #   note_display: hover
-  #   note_text: Based on Sales Revenue
-  #   listen:
-  #     SFDC Account ID: revenue.sfdc_account_id
-  #     Product Group: revenue.product_group
-  #     GCP Revenue Source: revenue.gcp_revenue_source
-  #     Billing Account ID: revenue.billing_account_id
-  #     Logical Product (L3): revenue.logical_product_l3
-  #     SKU ID: revenue.sku_id
-  #     Sub-Account Name: vector_customers.account_name
-  #     Is Data Analytics? (Yes / No): revenue.is_data_analytics
-  #     Revenue Granularity: revenue.revenue_granularity
-  #     Region: revenue.region
-  #     EMEA Geocluster: revenue.geocluster
-  #     NORTHAM Sector: revenue.sector
-  #     Sub Region: revenue.sub_region
-  #     Micro Region: revenue.micro_region
-  #     NAL Cluster: revenue.nal_cluster
-  #     NAL Subcluster: vector_customers.nal_sub_cluster
-  #     NAL Name: revenue.nal_name
-  #     Reporting Account Name: revenue.reporting_account_name
-  #     Segment: revenue.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
-  #     Is ISV? (Yes / No): vector_customers.is_isv
-  #   row: 7
-  #   col: 10
-  #   width: 7
-  #   height: 3
-  # - title: Navigation
-  #   name: Navigation
-  #   model: cloud_sales_bi
-  #   explore: pommelhorse_links
-  #   type: looker_grid
-  #   fields: [pommelhorse_links.link_name]
-  #   filters:
-  #     pommelhorse_links.category: Revenue Detail
-  #     pommelhorse_links.link_size: 1em
-  #   sorts: [pommelhorse_links.link_name]
-  #   limit: 500
-  #   column_limit: 50
-  #   query_timezone: America/Los_Angeles
-  #   show_view_names: false
-  #   show_row_numbers: false
-  #   transpose: false
-  #   truncate_text: false
-  #   hide_totals: false
-  #   hide_row_totals: false
-  #   size_to_fit: true
-  #   table_theme: white
-  #   limit_displayed_rows: false
-  #   enable_conditional_formatting: false
-  #   header_text_alignment: left
-  #   header_font_size: '18'
-  #   rows_font_size: '18'
-  #   conditional_formatting_include_totals: false
-  #   conditional_formatting_include_nulls: false
-  #   show_sql_query_menu_options: false
-  #   show_totals: true
-  #   show_row_totals: true
-  #   series_labels:
-  #     pommelhorse_links.link_name: Navigation
-  #   custom_color_enabled: true
-  #   show_single_value_title: true
-  #   show_comparison: false
-  #   comparison_type: value
-  #   comparison_reverse_colors: false
-  #   show_comparison_label: true
-  #   x_axis_gridlines: false
-  #   y_axis_gridlines: true
-  #   show_y_axis_labels: true
-  #   show_y_axis_ticks: true
-  #   y_axis_tick_density: default
-  #   y_axis_tick_density_custom: 5
-  #   show_x_axis_label: true
-  #   show_x_axis_ticks: true
-  #   y_axis_scale_mode: linear
-  #   x_axis_reversed: false
-  #   y_axis_reversed: false
-  #   plot_size_by_field: false
-  #   trellis: ''
-  #   stacking: ''
-  #   legend_position: center
-  #   point_style: none
-  #   show_value_labels: false
-  #   label_density: 25
-  #   x_axis_scale: auto
-  #   y_axis_combined: true
-  #   ordering: none
-  #   show_null_labels: false
-  #   show_totals_labels: false
-  #   show_silhouette: false
-  #   totals_color: "#808080"
-  #   defaults_version: 1
-  #   series_types: {}
-  #   hidden_fields: []
-  #   y_axes: []
-  #   title_hidden: true
-  #   listen:
-  #     SFDC Account ID: pommelhorse_links.account_id
-  #     Sub-Account Name: pommelhorse_links.account_name
-  #     Region: pommelhorse_links.region
-  #     EMEA Geocluster: pommelhorse_links.geocluster
-  #     NORTHAM Sector: pommelhorse_links.sector
-  #     Sub Region: pommelhorse_links.sub_region
-  #     Micro Region: pommelhorse_links.micro_region
-  #     NAL Cluster: pommelhorse_links.nal_cluster
-  #     NAL Subcluster: pommelhorse_links.nal_sub_cluster
-  #     NAL Name: pommelhorse_links.nal_name
-  #     Reporting Account Name: pommelhorse_links.reporting_account_name
-  #   row: 0
-  #   col: 0
-  #   width: 3
-  #   height: 12
-  # - title: 'Revenue Walk: List --> Gross'
-  #   name: 'Revenue Walk: List --> Gross'
-  #   model: cloud_sales_bi
-  #   explore: revenue
-  #   type: looker_waterfall
-  #   fields: [revenue.revenue_list, revenue.revenue_gross]
-  #   filters:
-  #     revenue.product_line: "-Looker,-Looker Data Platform SaaS"
-  #     revenue.usage_year: 1 years
-  #     revenue.service_family: CLOUD
-  #   limit: 500
-  #   dynamic_fields: [{category: table_calculation, expression: "-1 * (${revenue.revenue_list}-${revenue.revenue_gross})",
-  #       label: 'Negotiated Discounts, Fraud & BMODs', value_format: "[>1000000000]$0.00,,,\\\
-  #         B;[>1000000]$0.00,,\\M;$0.00,\\K", value_format_name: !!null '', _kind_hint: measure,
-  #       table_calculation: negotiated_discounts_fraud_bmods, _type_hint: number},
-  #     {category: measure, expression: !!null '', label: Revenue (Gross), value_format: !!null '',
-  #       value_format_name: !!null '', based_on: revenue.revenue_gross, _kind_hint: measure,
-  #       measure: revenue_gross, type: sum, _type_hint: number}, {category: table_calculation,
-  #       expression: "${revenue.revenue_gross}", label: Revenue (Gross), value_format: "[>1000000000]$0.00,,,\\\
-  #         B;[>1000000]$0.00,,\\M;$0.00,\\K", value_format_name: !!null '', _kind_hint: measure,
-  #       table_calculation: revenue_gross_1, _type_hint: number, is_disabled: true}]
-  #   filter_expression: "${revenue.usage_date} <= ${max_date.max_date_minus_2_date}"
-  #   up_color: "#4285F4"
-  #   down_color: "#EA4335"
-  #   total_color: "#FBBC04"
-  #   show_value_labels: true
-  #   show_x_axis_ticks: true
-  #   show_x_axis_label: true
-  #   x_axis_scale: auto
-  #   show_y_axis_labels: false
-  #   show_y_axis_ticks: true
-  #   y_axis_gridlines: true
-  #   label_color: ["#000"]
-  #   x_axis_gridlines: false
-  #   show_view_names: false
-  #   y_axis_tick_density: default
-  #   y_axis_tick_density_custom: 5
-  #   y_axis_scale_mode: linear
-  #   x_axis_reversed: false
-  #   y_axis_reversed: false
-  #   plot_size_by_field: false
-  #   trellis: ''
-  #   stacking: ''
-  #   limit_displayed_rows: false
-  #   legend_position: center
-  #   point_style: none
-  #   label_density: 25
-  #   y_axis_combined: true
-  #   ordering: none
-  #   show_null_labels: false
-  #   show_totals_labels: false
-  #   show_silhouette: false
-  #   totals_color: "#808080"
-  #   defaults_version: 1
-  #   series_types: {}
-  #   hidden_fields: [revenue.revenue_gross]
-  #   y_axes: []
-  #   listen:
-  #     SFDC Account ID: revenue.sfdc_account_id
-  #     Product Group: revenue.product_group
-  #     GCP Revenue Source: revenue.gcp_revenue_source
-  #     Billing Account ID: revenue.billing_account_id
-  #     Logical Product (L3): revenue.logical_product_l3
-  #     SKU ID: revenue.sku_id
-  #     Sub-Account Name: vector_customers.account_name
-  #     Is Data Analytics? (Yes / No): revenue.is_data_analytics
-  #     Revenue Granularity: revenue.revenue_granularity
-  #     Region: revenue.region
-  #     EMEA Geocluster: revenue.geocluster
-  #     NORTHAM Sector: revenue.sector
-  #     Sub Region: revenue.sub_region
-  #     Micro Region: revenue.micro_region
-  #     NAL Cluster: revenue.nal_cluster
-  #     NAL Subcluster: vector_customers.nal_sub_cluster
-  #     NAL Name: revenue.nal_name
-  #     Reporting Account Name: revenue.reporting_account_name
-  #     Segment: revenue.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
-  #     Is ISV? (Yes / No): vector_customers.is_isv
-  #   row: 33
-  #   col: 0
-  #   width: 6
-  #   height: 16
-  # - name: ''
-  #   type: text
-  #   title_text: ''
-  #   subtitle_text: ''
-  #   body_text: |-
-  #     <div id="discounts" style="text-align:center;font-size:1.5em">Revenue Walk</div>
-  #     <div style="text-align:center;font-size:1em">For more information, visit <a href="http://go/revenue-walk">go/revenue-walk</a></div>
-  #   row: 31
-  #   col: 0
-  #   width: 24
-  #   height: 2
-  # - title: Top Gainers
-  #   name: Top Gainers
-  #   model: cloud_sales_bi
-  #   explore: revenue
-  #   type: looker_grid
-  #   fields: [revenue.rolling_window_prior_window, revenue.rolling_window_current_window,
-  #     revenue.rolling_window_window_variance, revenue.reporting_account_name]
-  #   filters:
-  #     revenue.usage_date: 70 days
-  #     revenue.rolling_window: "-NULL"
-  #     revenue.window_size: '28'
-  #     revenue.rolling_window_current_window: ">=0"
-  #     revenue.rolling_window_prior_window: ">=0"
-  #     revenue.rolling_window_window_variance: ">0"
-  #     revenue.product_line: "-Looker,-Looker Data Platform SaaS"
-  #     revenue.service_family: CLOUD
-  #   sorts: [revenue.rolling_window_window_variance desc]
-  #   limit: 50
-  #   column_limit: 50
-  #   dynamic_fields: [{category: table_calculation, expression: "${revenue.rolling_window_window_variance}/${revenue.rolling_window_prior_window}",
-  #       label: MoM List, value_format: !!null '', value_format_name: percent_0, _kind_hint: measure,
-  #       table_calculation: mom_list, _type_hint: number}]
-  #   query_timezone: America/Los_Angeles
-  #   show_view_names: false
-  #   show_row_numbers: false
-  #   transpose: false
-  #   truncate_text: false
-  #   hide_totals: false
-  #   hide_row_totals: false
-  #   size_to_fit: true
-  #   table_theme: white
-  #   limit_displayed_rows: false
-  #   enable_conditional_formatting: true
-  #   header_text_alignment: left
-  #   header_font_size: '12'
-  #   rows_font_size: '12'
-  #   conditional_formatting_include_totals: false
-  #   conditional_formatting_include_nulls: false
-  #   show_sql_query_menu_options: false
-  #   column_order: [revenue.reporting_account_name, revenue.rolling_window_current_window,
-  #     revenue.rolling_window_prior_window, revenue.rolling_window_window_variance,
-  #     mom]
-  #   show_totals: true
-  #   show_row_totals: true
-  #   series_labels:
-  #     revenue.rolling_window_prior_window: 28 Days Before That
-  #     revenue.rolling_window_current_window: 28 Days Ago
-  #     revenue.rolling_window_window_variance: Sales Revenue Growth $
-  #     mom: Sales Revenue Growth %
-  #     mom_list: Sales Revenue Growth %
-  #   series_column_widths:
-  #     revenue.rolling_window: 282
-  #     account_meta.customer_name: 298
-  #   series_cell_visualizations:
-  #     revenue.revenue_net_cn:
-  #       is_active: true
-  #       palette:
-  #         palette_id: 3de02744-c6d0-ba29-2378-81b0f7919624
-  #         collection_id: google
-  #         custom_colors:
-  #         - "#4285F4"
-  #         - "#185ABC"
-  #   limit_displayed_rows_values:
-  #     show_hide: show
-  #     first_last: first
-  #     num_rows: '2'
-  #   header_font_color: "#5F6368"
-  #   conditional_formatting: [{type: greater than, value: 0, background_color: '',
-  #       font_color: "#137333", color_application: {collection_id: google, palette_id: google-sequential-0},
-  #       bold: false, italic: false, strikethrough: false, fields: [revenue.rolling_window_window_variance]},
-  #     {type: less than, value: 0, background_color: '', font_color: "#B31412", color_application: {
-  #         collection_id: google, palette_id: google-sequential-0}, bold: false, italic: false,
-  #       strikethrough: false, fields: [revenue.rolling_window_window_variance]}]
-  #   x_axis_gridlines: false
-  #   y_axis_gridlines: true
-  #   show_y_axis_labels: true
-  #   show_y_axis_ticks: true
-  #   y_axis_tick_density: default
-  #   y_axis_tick_density_custom: 5
-  #   show_x_axis_label: true
-  #   show_x_axis_ticks: true
-  #   y_axis_scale_mode: linear
-  #   x_axis_reversed: false
-  #   y_axis_reversed: false
-  #   plot_size_by_field: false
-  #   trellis: ''
-  #   stacking: ''
-  #   legend_position: center
-  #   point_style: none
-  #   show_value_labels: false
-  #   label_density: 25
-  #   x_axis_scale: auto
-  #   y_axis_combined: true
-  #   show_null_points: true
-  #   interpolation: linear
-  #   defaults_version: 1
-  #   series_types: {}
-  #   hidden_fields: [current_month_to_date]
-  #   ordering: none
-  #   show_null_labels: false
-  #   show_totals_labels: false
-  #   show_silhouette: false
-  #   totals_color: "#808080"
-  #   hidden_points_if_no: []
-  #   y_axes: []
-  #   listen:
-  #     SFDC Account ID: revenue.sfdc_account_id
-  #     Product Group: revenue.product_group
-  #     GCP Revenue Source: revenue.gcp_revenue_source
-  #     Billing Account ID: revenue.billing_account_id
-  #     Logical Product (L3): revenue.logical_product_l3
-  #     SKU ID: revenue.sku_id
-  #     Sub-Account Name: vector_customers.account_name
-  #     Is Data Analytics? (Yes / No): revenue.is_data_analytics
-  #     Revenue Granularity: revenue.revenue_granularity
-  #     Region: revenue.region
-  #     EMEA Geocluster: revenue.geocluster
-  #     NORTHAM Sector: revenue.sector
-  #     Sub Region: revenue.sub_region
-  #     Micro Region: revenue.micro_region
-  #     NAL Cluster: revenue.nal_cluster
-  #     NAL Subcluster: vector_customers.nal_sub_cluster
-  #     NAL Name: revenue.nal_name
-  #     Reporting Account Name: revenue.reporting_account_name
-  #     Segment: revenue.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
-  #     Is ISV? (Yes / No): vector_customers.is_isv
-  #   row: 63
-  #   col: 0
-  #   width: 12
-  #   height: 6
-  # - title: Top Decliners
-  #   name: Top Decliners
-  #   model: cloud_sales_bi
-  #   explore: revenue
-  #   type: looker_grid
-  #   fields: [revenue.rolling_window_prior_window, revenue.rolling_window_current_window,
-  #     revenue.rolling_window_window_variance, revenue.reporting_account_name]
-  #   filters:
-  #     revenue.usage_date: 70 days
-  #     revenue.rolling_window: "-NULL"
-  #     revenue.window_size: '28'
-  #     revenue.rolling_window_current_window: ">=0"
-  #     revenue.rolling_window_prior_window: ">=0"
-  #     revenue.rolling_window_window_variance: "<=0"
-  #     revenue.product_line: "-Looker,-Looker Data Platform SaaS"
-  #     revenue.service_family: CLOUD
-  #   sorts: [revenue.rolling_window_window_variance]
-  #   limit: 50
-  #   column_limit: 50
-  #   dynamic_fields: [{table_calculation: mom, label: MoM, expression: "${revenue.rolling_window_window_variance}/${revenue.rolling_window_prior_window}",
-  #       value_format: !!null '', value_format_name: percent_0, _kind_hint: measure,
-  #       _type_hint: number}]
-  #   query_timezone: America/Los_Angeles
-  #   show_view_names: false
-  #   show_row_numbers: false
-  #   transpose: false
-  #   truncate_text: false
-  #   hide_totals: false
-  #   hide_row_totals: false
-  #   size_to_fit: true
-  #   table_theme: white
-  #   limit_displayed_rows: false
-  #   enable_conditional_formatting: true
-  #   header_text_alignment: left
-  #   header_font_size: '12'
-  #   rows_font_size: '12'
-  #   conditional_formatting_include_totals: false
-  #   conditional_formatting_include_nulls: false
-  #   show_sql_query_menu_options: false
-  #   column_order: [revenue.reporting_account_name, revenue.rolling_window_current_window,
-  #     revenue.rolling_window_prior_window, revenue.rolling_window_window_variance,
-  #     mom]
-  #   show_totals: true
-  #   show_row_totals: true
-  #   series_labels:
-  #     revenue.rolling_window_prior_window: 28 Days Before That
-  #     revenue.rolling_window_current_window: 28 Days Ago
-  #     revenue.rolling_window_window_variance: Sales Revenue Growth $
-  #     mom: Sales Revenue Growth %
-  #   series_column_widths:
-  #     revenue.rolling_window: 282
-  #     account_meta.customer_name: 298
-  #   series_cell_visualizations:
-  #     revenue.revenue_net_cn:
-  #       is_active: true
-  #       palette:
-  #         palette_id: 3de02744-c6d0-ba29-2378-81b0f7919624
-  #         collection_id: google
-  #         custom_colors:
-  #         - "#4285F4"
-  #         - "#185ABC"
-  #   limit_displayed_rows_values:
-  #     show_hide: show
-  #     first_last: first
-  #     num_rows: '2'
-  #   header_font_color: "#5F6368"
-  #   conditional_formatting: [{type: greater than, value: 0, background_color: '',
-  #       font_color: "#137333", color_application: {collection_id: google, palette_id: google-sequential-0},
-  #       bold: false, italic: false, strikethrough: false, fields: [revenue.rolling_window_window_variance,
-  #         mom]}, {type: less than, value: 0, background_color: '', font_color: "#B31412",
-  #       color_application: {collection_id: google, palette_id: google-sequential-0},
-  #       bold: false, italic: false, strikethrough: false, fields: [revenue.rolling_window_window_variance,
-  #         mom]}]
-  #   x_axis_gridlines: false
-  #   y_axis_gridlines: true
-  #   show_y_axis_labels: true
-  #   show_y_axis_ticks: true
-  #   y_axis_tick_density: default
-  #   y_axis_tick_density_custom: 5
-  #   show_x_axis_label: true
-  #   show_x_axis_ticks: true
-  #   y_axis_scale_mode: linear
-  #   x_axis_reversed: false
-  #   y_axis_reversed: false
-  #   plot_size_by_field: false
-  #   trellis: ''
-  #   stacking: ''
-  #   legend_position: center
-  #   point_style: none
-  #   show_value_labels: false
-  #   label_density: 25
-  #   x_axis_scale: auto
-  #   y_axis_combined: true
-  #   show_null_points: true
-  #   interpolation: linear
-  #   defaults_version: 1
-  #   series_types: {}
-  #   hidden_fields: [current_month_to_date]
-  #   ordering: none
-  #   show_null_labels: false
-  #   show_totals_labels: false
-  #   show_silhouette: false
-  #   totals_color: "#808080"
-  #   hidden_points_if_no: []
-  #   y_axes: []
-  #   listen:
-  #     SFDC Account ID: revenue.sfdc_account_id
-  #     Product Group: revenue.product_group
-  #     GCP Revenue Source: revenue.gcp_revenue_source
-  #     Billing Account ID: revenue.billing_account_id
-  #     Logical Product (L3): revenue.logical_product_l3
-  #     SKU ID: revenue.sku_id
-  #     Sub-Account Name: vector_customers.account_name
-  #     Is Data Analytics? (Yes / No): revenue.is_data_analytics
-  #     Revenue Granularity: revenue.revenue_granularity
-  #     Region: revenue.region
-  #     EMEA Geocluster: revenue.geocluster
-  #     NORTHAM Sector: revenue.sector
-  #     Sub Region: revenue.sub_region
-  #     Micro Region: revenue.micro_region
-  #     NAL Cluster: revenue.nal_cluster
-  #     NAL Subcluster: vector_customers.nal_sub_cluster
-  #     NAL Name: revenue.nal_name
-  #     Reporting Account Name: revenue.reporting_account_name
-  #     Segment: revenue.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
-  #     Is ISV? (Yes / No): vector_customers.is_isv
-  #   row: 63
-  #   col: 12
-  #   width: 12
-  #   height: 6
-  # - name: " (2)"
-  #   type: text
-  #   title_text: ''
-  #   subtitle_text: ''
-  #   body_text: <div style="text-align:center;font-size:1.5em"><a href="#growth"><img
-  #     src="https://fonts.gstatic.com/s/i/short-term/release/googlesymbols/sort/default/24px.svg">Growth</a></div>
-  #   row: 10
-  #   col: 13
-  #   width: 5
-  #   height: 2
-  # - name: " (3)"
-  #   type: text
-  #   title_text: ''
-  #   subtitle_text: ''
-  #   body_text: <div id="growth" style="text-align:center;font-size:1.5em">Growth (28
-  #     days vs. Prior 28 Days)</div>
-  #   row: 61
-  #   col: 0
-  #   width: 24
-  #   height: 2
-  # - name: " (4)"
-  #   type: text
-  #   title_text: ''
-  #   subtitle_text: ''
-  #   body_text: <div style="text-align:center;font-size:1.5em"><a href="#discounts"><img
-  #     src="https://fonts.gstatic.com/s/i/short-term/release/googlesymbols/local_offer/default/24px.svg">Revenue
-  #     Walk</a></div>
-  #   row: 10
-  #   col: 8
-  #   width: 5
-  #   height: 2
-  # - title: Weekly Sales Revenue Trends
-  #   name: Weekly Sales Revenue Trends
-  #   model: cloud_sales_bi
-  #   explore: revenue
-  #   type: looker_line
-  #   fields: [revenue.usage_week, revenue.revenue_toggle]
-  #   fill_fields: [revenue.usage_week]
-  #   filters:
-  #     revenue.product_line: "-Looker,-Looker Data Platform SaaS"
-  #     revenue.usage_week: 52 weeks ago for 52 weeks
-  #     revenue.service_family: CLOUD
-  #   sorts: [revenue.usage_week desc]
-  #   limit: 500
-  #   query_timezone: America/Los_Angeles
-  #   x_axis_gridlines: false
-  #   y_axis_gridlines: true
-  #   show_view_names: false
-  #   show_y_axis_labels: true
-  #   show_y_axis_ticks: true
-  #   y_axis_tick_density: default
-  #   y_axis_tick_density_custom: 5
-  #   show_x_axis_label: false
-  #   show_x_axis_ticks: true
-  #   y_axis_scale_mode: linear
-  #   x_axis_reversed: false
-  #   y_axis_reversed: false
-  #   plot_size_by_field: false
-  #   trellis: ''
-  #   stacking: ''
-  #   limit_displayed_rows: false
-  #   legend_position: center
-  #   point_style: none
-  #   show_value_labels: true
-  #   label_density: 25
-  #   x_axis_scale: auto
-  #   y_axis_combined: true
-  #   show_null_points: true
-  #   interpolation: linear
-  #   y_axes: [{label: Weekly Revenue, orientation: left, series: [{axisId: revenue.revenue_toggle,
-  #           id: revenue.revenue_toggle, name: Revenue (Toggle-able)}], showLabels: true,
-  #       showValues: true, valueFormat: "[>1000000000]$0.00,,,\\B;[>1000000]$0.00,,\\\
-  #         M;$0,\\K", unpinAxis: true, tickDensity: default, tickDensityCustom: 5,
-  #       type: linear}]
-  #   label_value_format: "[>1000000000]$0.00,,,\\B;[>1000000]$0.00,,\\M;$0.00,\\K"
-  #   series_types: {}
-  #   ordering: none
-  #   show_null_labels: false
-  #   show_totals_labels: false
-  #   show_silhouette: false
-  #   totals_color: "#808080"
-  #   defaults_version: 1
-  #   hidden_fields: []
-  #   listen:
-  #     SFDC Account ID: revenue.sfdc_account_id
-  #     Product Group: revenue.product_group
-  #     GCP Revenue Source: revenue.gcp_revenue_source
-  #     Billing Account ID: revenue.billing_account_id
-  #     Logical Product (L3): revenue.logical_product_l3
-  #     SKU ID: revenue.sku_id
-  #     Sub-Account Name: vector_customers.account_name
-  #     Is Data Analytics? (Yes / No): revenue.is_data_analytics
-  #     Revenue Granularity: revenue.revenue_granularity
-  #     Region: revenue.region
-  #     EMEA Geocluster: revenue.geocluster
-  #     NORTHAM Sector: revenue.sector
-  #     Sub Region: revenue.sub_region
-  #     Micro Region: revenue.micro_region
-  #     NAL Cluster: revenue.nal_cluster
-  #     NAL Subcluster: vector_customers.nal_sub_cluster
-  #     NAL Name: revenue.nal_name
-  #     Reporting Account Name: revenue.reporting_account_name
-  #     Segment: revenue.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
-  #     Is ISV? (Yes / No): vector_customers.is_isv
-  #   row: 18
-  #   col: 0
-  #   width: 24
-  #   height: 6
-  # - name: " (5)"
-  #   type: text
-  #   title_text: ''
-  #   subtitle_text: ''
-  #   body_text: |-
-  #     <div style="height:2em;font-size:1.5em;text-align:center"><a href="http://go/bhi-bug" target="_blank"><img src="https://fonts.gstatic.com/s/i/short-term/release/googlesymbols/bug_report/default/24px.svg
-  #     ">File a Bug</a></div>
-  #   row: 10
-  #   col: 3
-  #   width: 5
-  #   height: 2
-  # - name: " (6)"
-  #   type: text
-  #   title_text: ''
-  #   subtitle_text: ''
-  #   body_text: |-
-  #     <div style="text-align:center;font-size:1.2em">
-  #     Missing the old <a href="https://data.corp.google.com/sites/q1yjy0md0d87/insights__trends/">Account360</a>?
-  #     </div>
-  #   row: 10
-  #   col: 18
-  #   width: 6
-  #   height: 2
-  # - title: 'Revenue Walk: Gross --> Invoice'
-  #   name: 'Revenue Walk: Gross --> Invoice'
-  #   model: cloud_sales_bi
-  #   explore: revenue
-  #   type: looker_waterfall
-  #   fields: [revenue.revenue_invoice, revenue.invoice_revenue_components_gross, revenue.invoice_revenue_components_ft,
-  #     revenue.invoice_revenue_components_sud, revenue.invoice_revenue_components_cud,
-  #     revenue.invoice_revenue_components_promo, revenue.invoice_revenue_components_reseller_credit,
-  #     revenue.invoice_revenue_components_cross_pa_credits_addback]
-  #   filters:
-  #     revenue.product_line: "-Looker,-Looker Data Platform SaaS"
-  #     revenue.usage_year: 1 years
-  #     revenue.service_family: CLOUD
-  #   limit: 500
-  #   dynamic_fields: [{category: table_calculation, expression: "-1 * (${revenue.revenue_gross}+(\n\
-  #         \  ${revenue.revenue_promo}+${revenue.revenue_ft}+${revenue.revenue_ft}+${revenue.revenue_reseller}+${revenue.revenue_cud}+${revenue.revenue_sud}+${revenue.revenue_cross_pa_credits}\n\
-  #         ) - ${revenue.revenue_invoice})", label: Discounts (Other), value_format: "$0.00,,\\\
-  #         M", value_format_name: !!null '', _kind_hint: measure, table_calculation: discounts_other,
-  #       _type_hint: number, is_disabled: true}]
-  #   filter_expression: "${revenue.usage_date} <= ${max_date.max_date_minus_2_date}"
-  #   up_color: "#4285F4"
-  #   down_color: "#EA4335"
-  #   total_color: "#FBBC04"
-  #   show_value_labels: true
-  #   show_x_axis_ticks: true
-  #   show_x_axis_label: true
-  #   x_axis_scale: auto
-  #   show_y_axis_labels: false
-  #   show_y_axis_ticks: true
-  #   y_axis_gridlines: true
-  #   label_color: ["#000"]
-  #   x_axis_gridlines: false
-  #   show_view_names: false
-  #   y_axis_tick_density: default
-  #   y_axis_tick_density_custom: 5
-  #   y_axis_scale_mode: linear
-  #   x_axis_reversed: false
-  #   y_axis_reversed: false
-  #   plot_size_by_field: false
-  #   trellis: ''
-  #   stacking: ''
-  #   limit_displayed_rows: false
-  #   legend_position: center
-  #   point_style: none
-  #   label_density: 25
-  #   y_axis_combined: true
-  #   ordering: none
-  #   show_null_labels: false
-  #   show_totals_labels: false
-  #   show_silhouette: false
-  #   totals_color: "#808080"
-  #   defaults_version: 1
-  #   series_types: {}
-  #   hidden_fields: [revenue.revenue_invoice]
-  #   y_axes: []
-  #   listen:
-  #     SFDC Account ID: revenue.sfdc_account_id
-  #     Product Group: revenue.product_group
-  #     GCP Revenue Source: revenue.gcp_revenue_source
-  #     Billing Account ID: revenue.billing_account_id
-  #     Logical Product (L3): revenue.logical_product_l3
-  #     SKU ID: revenue.sku_id
-  #     Sub-Account Name: vector_customers.account_name
-  #     Is Data Analytics? (Yes / No): revenue.is_data_analytics
-  #     Revenue Granularity: revenue.revenue_granularity
-  #     Region: revenue.region
-  #     EMEA Geocluster: revenue.geocluster
-  #     NORTHAM Sector: revenue.sector
-  #     Sub Region: revenue.sub_region
-  #     Micro Region: revenue.micro_region
-  #     NAL Cluster: revenue.nal_cluster
-  #     NAL Subcluster: vector_customers.nal_sub_cluster
-  #     NAL Name: revenue.nal_name
-  #     Reporting Account Name: revenue.reporting_account_name
-  #     Segment: revenue.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
-  #     Is ISV? (Yes / No): vector_customers.is_isv
-  #   row: 33
-  #   col: 6
-  #   width: 18
-  #   height: 8
-  # - title: 'Revenue Walk: Gross --> Sales'
-  #   name: 'Revenue Walk: Gross --> Sales'
-  #   model: cloud_sales_bi
-  #   explore: revenue
-  #   type: looker_waterfall
-  #   fields: [revenue.revenue_net_cn, revenue.sales_revenue_components_gross, revenue.sales_revenue_components_ft,
-  #     revenue.sales_revenue_components_sud, revenue.sales_revenue_components_cud,
-  #     revenue.sales_revenue_components_promo, revenue.sales_revenue_components_reseller_credit,
-  #     revenue.sales_revenue_components_cross_pa_credits_addback, revenue.sales_revenue_components_isv_deduction,
-  #     revenue.sales_revenue_components_partner_margin_addback]
-  #   filters:
-  #     revenue.product_line: "-Looker,-Looker Data Platform SaaS"
-  #     revenue.usage_year: 1 years
-  #     revenue.service_family: CLOUD
-  #   limit: 500
-  #   dynamic_fields: [{category: measure, expression: !!null '', label: Revenue (Gross),
-  #       value_format: !!null '', value_format_name: !!null '', based_on: revenue.revenue_gross,
-  #       _kind_hint: measure, measure: revenue_gross, type: sum, _type_hint: number},
-  #     {category: measure, expression: '${revenue.segment}="Corporate" OR ${revenue.region}="PUBLIC
-  #         SECTOR"', label: Corp & GPS Partner Margin, value_format: !!null '', value_format_name: !!null '',
-  #       based_on: revenue.revenue_reseller, filter_expression: '${revenue.segment}="Corporate"
-  #         OR ${revenue.region}="PUBLIC SECTOR"', _kind_hint: measure, measure: corp_gps_partner_margin,
-  #       type: sum, _type_hint: number, filters: {}}]
-  #   filter_expression: "${revenue.usage_date} <= ${max_date.max_date_minus_2_date}"
-  #   up_color: "#4285F4"
-  #   down_color: "#EA4335"
-  #   total_color: "#FBBC04"
-  #   show_value_labels: true
-  #   show_x_axis_ticks: true
-  #   show_x_axis_label: true
-  #   x_axis_scale: auto
-  #   show_y_axis_labels: false
-  #   show_y_axis_ticks: true
-  #   y_axis_gridlines: true
-  #   label_color: ["#000"]
-  #   x_axis_gridlines: false
-  #   show_view_names: false
-  #   y_axis_tick_density: default
-  #   y_axis_tick_density_custom: 5
-  #   y_axis_scale_mode: linear
-  #   x_axis_reversed: false
-  #   y_axis_reversed: false
-  #   plot_size_by_field: false
-  #   trellis: ''
-  #   stacking: ''
-  #   limit_displayed_rows: false
-  #   legend_position: center
-  #   point_style: none
-  #   label_density: 25
-  #   y_axis_combined: true
-  #   ordering: none
-  #   show_null_labels: false
-  #   show_totals_labels: false
-  #   show_silhouette: false
-  #   totals_color: "#808080"
-  #   defaults_version: 1
-  #   series_types: {}
-  #   hidden_fields: [revenue.revenue_net_cn]
-  #   y_axes: []
-  #   listen:
-  #     SFDC Account ID: revenue.sfdc_account_id
-  #     Product Group: revenue.product_group
-  #     GCP Revenue Source: revenue.gcp_revenue_source
-  #     Billing Account ID: revenue.billing_account_id
-  #     Logical Product (L3): revenue.logical_product_l3
-  #     SKU ID: revenue.sku_id
-  #     Sub-Account Name: vector_customers.account_name
-  #     Is Data Analytics? (Yes / No): revenue.is_data_analytics
-  #     Revenue Granularity: revenue.revenue_granularity
-  #     Region: revenue.region
-  #     EMEA Geocluster: revenue.geocluster
-  #     NORTHAM Sector: revenue.sector
-  #     Sub Region: revenue.sub_region
-  #     Micro Region: revenue.micro_region
-  #     NAL Cluster: revenue.nal_cluster
-  #     NAL Subcluster: vector_customers.nal_sub_cluster
-  #     NAL Name: revenue.nal_name
-  #     Reporting Account Name: revenue.reporting_account_name
-  #     Segment: revenue.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
-  #     Is ISV? (Yes / No): vector_customers.is_isv
-  #   row: 41
-  #   col: 6
-  #   width: 18
-  #   height: 8
-  # - title: List, Gross & Sales Revenue Comparison (Weekly)
-  #   name: List, Gross & Sales Revenue Comparison (Weekly)
-  #   model: cloud_sales_bi
-  #   explore: revenue
-  #   type: looker_line
-  #   fields: [revenue.revenue_net_cn, revenue.revenue_list, revenue.usage_week, revenue.revenue_gross,
-  #     revenue.revenue_cud, revenue.revenue_promo, revenue.revenue_bmod]
-  #   filters:
-  #     revenue.product_line: "-Looker,-Looker Data Platform SaaS"
-  #     revenue.service_family: CLOUD
-  #     revenue.usage_month: 12 months
-  #   sorts: [revenue.usage_week desc]
-  #   limit: 500
-  #   x_axis_gridlines: false
-  #   y_axis_gridlines: true
-  #   show_view_names: false
-  #   show_y_axis_labels: false
-  #   show_y_axis_ticks: true
-  #   y_axis_tick_density: default
-  #   y_axis_tick_density_custom: 5
-  #   show_x_axis_label: false
-  #   show_x_axis_ticks: true
-  #   y_axis_scale_mode: linear
-  #   x_axis_reversed: false
-  #   y_axis_reversed: false
-  #   plot_size_by_field: false
-  #   trellis: ''
-  #   stacking: ''
-  #   limit_displayed_rows: false
-  #   legend_position: center
-  #   point_style: none
-  #   show_value_labels: true
-  #   label_density: 25
-  #   x_axis_scale: auto
-  #   y_axis_combined: true
-  #   show_null_points: true
-  #   interpolation: linear
-  #   y_axes: [{label: '', orientation: left, series: [{axisId: revenue.revenue_net_cn,
-  #           id: revenue.revenue_net_cn, name: Revenue (Sales)}, {axisId: revenue.revenue_list,
-  #           id: revenue.revenue_list, name: "[go/listrev] Revenue (List)"}, {axisId: revenue.revenue_gross,
-  #           id: revenue.revenue_gross, name: Revenue (Gross)}, {axisId: revenue.revenue_cud,
-  #           id: revenue.revenue_cud, name: Revenue (Committed Usage Discount)}, {
-  #           axisId: revenue.revenue_promo, id: revenue.revenue_promo, name: Revenue
-  #             (Promo)}, {axisId: revenue.revenue_bmod, id: revenue.revenue_bmod, name: Revenue
-  #             (Billing Modifications)}], showLabels: false, showValues: true, minValue: !!null '',
-  #       valueFormat: "[>=1000000000]$0.0,,,\\B;[>1000000]$0.0,,\\M;$0.0,\\K", unpinAxis: true,
-  #       tickDensity: default, tickDensityCustom: 5, type: linear}]
-  #   hidden_series: []
-  #   label_value_format: "[>1000000000]$0.00,,,\\B;[>1000000]$0.0,,\\M;$0.0,\\K"
-  #   series_types: {}
-  #   label_color: []
-  #   ordering: none
-  #   show_null_labels: false
-  #   show_totals_labels: true
-  #   show_silhouette: false
-  #   totals_color: "#808080"
-  #   up_color: "#4285F4"
-  #   down_color: "#EA4335"
-  #   total_color: "#FBBC04"
-  #   defaults_version: 1
-  #   hidden_fields: []
-  #   listen:
-  #     SFDC Account ID: revenue.sfdc_account_id
-  #     Product Group: revenue.product_group
-  #     GCP Revenue Source: revenue.gcp_revenue_source
-  #     Billing Account ID: revenue.billing_account_id
-  #     Logical Product (L3): revenue.logical_product_l3
-  #     SKU ID: revenue.sku_id
-  #     Sub-Account Name: vector_customers.account_name
-  #     Is Data Analytics? (Yes / No): revenue.is_data_analytics
-  #     Revenue Granularity: revenue.revenue_granularity
-  #     Region: revenue.region
-  #     EMEA Geocluster: revenue.geocluster
-  #     NORTHAM Sector: revenue.sector
-  #     Sub Region: revenue.sub_region
-  #     Micro Region: revenue.micro_region
-  #     NAL Cluster: revenue.nal_cluster
-  #     NAL Subcluster: vector_customers.nal_sub_cluster
-  #     NAL Name: revenue.nal_name
-  #     Reporting Account Name: revenue.reporting_account_name
-  #     Segment: revenue.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
-  #     Is ISV? (Yes / No): vector_customers.is_isv
-  #   row: 49
-  #   col: 0
-  #   width: 24
-  #   height: 12
-  # - title: Most Recent Revenue Data
-  #   name: Most Recent Revenue Data
-  #   model: cloud_sales_bi
-  #   explore: revenue
-  #   type: single_value
-  #   fields: [revenue.usage_date, revenue.revenue_net_cn]
-  #   fill_fields: [revenue.usage_date]
-  #   filters:
-  #     revenue.product_line: "-Looker,-Looker Data Platform SaaS"
-  #     revenue.service_family: CLOUD
-  #     revenue.usage_date: 30 days
-  #   sorts: [revenue.usage_date desc]
-  #   limit: 500
-  #   dynamic_fields: [{category: table_calculation, expression: "(${revenue.revenue_toggle}-offset(${revenue.revenue_toggle},1))/offset(${revenue.revenue_toggle},1)",
-  #       label: YoY %, value_format: !!null '', value_format_name: percent_0, _kind_hint: measure,
-  #       table_calculation: yoy, _type_hint: number, is_disabled: true}, {category: table_calculation,
-  #       expression: "${revenue.revenue_net_cn} > 0.5 * median(${revenue.revenue_net_cn})",
-  #       label: 'Is valid row?', value_format: "$0.00,\\K", value_format_name: !!null '',
-  #       _kind_hint: measure, table_calculation: is_valid_row, _type_hint: yesno}]
-  #   query_timezone: America/Los_Angeles
-  #   custom_color_enabled: true
-  #   show_single_value_title: true
-  #   show_comparison: false
-  #   comparison_type: change
-  #   comparison_reverse_colors: false
-  #   show_comparison_label: true
-  #   enable_conditional_formatting: false
-  #   conditional_formatting_include_totals: false
-  #   conditional_formatting_include_nulls: false
-  #   x_axis_gridlines: false
-  #   y_axis_gridlines: true
-  #   show_view_names: false
-  #   y_axes: [{label: '', orientation: left, series: [{axisId: revenue.revenue_net_cn,
-  #           id: revenue.revenue_net_cn, name: 'Revenue (Net, Channel Neutral)'}],
-  #       showLabels: true, showValues: true, unpinAxis: true, tickDensity: default,
-  #       tickDensityCustom: 5, type: linear}]
-  #   show_y_axis_labels: true
-  #   show_y_axis_ticks: true
-  #   y_axis_tick_density: default
-  #   y_axis_tick_density_custom: 5
-  #   show_x_axis_label: true
-  #   show_x_axis_ticks: true
-  #   y_axis_scale_mode: linear
-  #   x_axis_reversed: false
-  #   y_axis_reversed: false
-  #   plot_size_by_field: false
-  #   trellis: ''
-  #   stacking: normal
-  #   limit_displayed_rows: false
-  #   legend_position: center
-  #   series_types: {}
-  #   point_style: none
-  #   show_value_labels: true
-  #   label_density: 25
-  #   x_axis_scale: auto
-  #   y_axis_combined: true
-  #   show_null_points: true
-  #   interpolation: linear
-  #   ordering: none
-  #   show_null_labels: false
-  #   show_totals_labels: false
-  #   show_silhouette: false
-  #   totals_color: "#808080"
-  #   defaults_version: 1
-  #   hidden_fields: [revenue.revenue_net_cn]
-  #   hidden_points_if_no: [is_valid_row]
-  #   note_state: collapsed
-  #   note_display: hover
-  #   note_text: Most recent date with complete revenue numbers
-  #   listen:
-  #     SFDC Account ID: revenue.sfdc_account_id
-  #     Product Group: revenue.product_group
-  #     GCP Revenue Source: revenue.gcp_revenue_source
-  #     Billing Account ID: revenue.billing_account_id
-  #     Logical Product (L3): revenue.logical_product_l3
-  #     SKU ID: revenue.sku_id
-  #     Sub-Account Name: vector_customers.account_name
-  #     Is Data Analytics? (Yes / No): revenue.is_data_analytics
-  #     Revenue Granularity: revenue.revenue_granularity
-  #     Region: revenue.region
-  #     EMEA Geocluster: revenue.geocluster
-  #     NORTHAM Sector: revenue.sector
-  #     Sub Region: revenue.sub_region
-  #     Micro Region: revenue.micro_region
-  #     NAL Cluster: revenue.nal_cluster
-  #     NAL Subcluster: vector_customers.nal_sub_cluster
-  #     NAL Name: revenue.nal_name
-  #     Reporting Account Name: revenue.reporting_account_name
-  #     Segment: revenue.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
-  #     Is ISV? (Yes / No): vector_customers.is_isv
-  #   row: 4
-  #   col: 3
-  #   width: 7
-  #   height: 3
+  - title: MTD
+    name: MTD
+    model: hdeist-test-model
+    explore: revenue
+    type: single_value
+    fields: [revenue.month_to_date, revenue.revenue_toggle]
+    filters:
+      revenue.product_line: "-Looker,-Looker Data Platform SaaS"
+      revenue.month_to_date: "-NULL"
+      revenue.usage_month: 3 months
+      revenue.metric_selector: blended
+    sorts: [revenue.month_to_date desc]
+    limit: 500
+    dynamic_fields: [{category: table_calculation, expression: "(${revenue.revenue_toggle}-offset(${revenue.revenue_toggle},1))/offset(${revenue.revenue_toggle},1)",
+        label: MoM %, value_format: !!null '', value_format_name: percent_0, _kind_hint: measure,
+        table_calculation: mom, _type_hint: number}]
+    query_timezone: America/Los_Angeles
+    custom_color_enabled: true
+    show_single_value_title: true
+    show_comparison: true
+    comparison_type: change
+    comparison_reverse_colors: false
+    show_comparison_label: true
+    enable_conditional_formatting: false
+    conditional_formatting_include_totals: false
+    conditional_formatting_include_nulls: false
+    x_axis_gridlines: false
+    y_axis_gridlines: true
+    show_view_names: false
+    y_axes: [{label: '', orientation: left, series: [{axisId: revenue.revenue_net_cn,
+            id: revenue.revenue_net_cn, name: 'Revenue (Net, Channel Neutral)'}],
+        showLabels: true, showValues: true, unpinAxis: true, tickDensity: default,
+        tickDensityCustom: 5, type: linear}]
+    show_y_axis_labels: true
+    show_y_axis_ticks: true
+    y_axis_tick_density: default
+    y_axis_tick_density_custom: 5
+    show_x_axis_label: true
+    show_x_axis_ticks: true
+    y_axis_scale_mode: linear
+    x_axis_reversed: false
+    y_axis_reversed: false
+    plot_size_by_field: false
+    trellis: ''
+    stacking: normal
+    limit_displayed_rows: false
+    legend_position: center
+    series_types: {}
+    point_style: none
+    show_value_labels: true
+    label_density: 25
+    x_axis_scale: auto
+    y_axis_combined: true
+    show_null_points: true
+    interpolation: linear
+    ordering: none
+    show_null_labels: false
+    show_totals_labels: false
+    show_silhouette: false
+    totals_color: "#808080"
+    defaults_version: 1
+    hidden_fields: []
+    note_state: collapsed
+    note_display: hover
+    note_text: Based on Sales Revenue
+    listen:
+      SFDC Account ID: revenue.sfdc_account_id
+      Product Group: revenue.product_group
+      GCP Revenue Source: revenue.gcp_revenue_source
+      Billing Account ID: revenue.billing_account_id
+      Logical Product (L3): revenue.logical_product_l3
+      SKU ID: revenue.sku_id
+      Sub-Account Name: vector_customers.account_name
+      Is Data Analytics? (Yes / No): revenue.is_data_analytics
+      Revenue Granularity: revenue.revenue_granularity
+      Region: revenue.region
+      EMEA Geocluster: revenue.geocluster
+      NORTHAM Sector: revenue.sector
+      Sub Region: revenue.sub_region
+      Micro Region: revenue.micro_region
+      NAL Cluster: revenue.nal_cluster
+      NAL Subcluster: vector_customers.nal_sub_cluster
+      NAL Name: revenue.nal_name
+      Reporting Account Name: revenue.reporting_account_name
+      Segment: revenue.segment
+      Digital Native vs Traditional: vector_customers.is_digital_native
+      Is ISV? (Yes / No): vector_customers.is_isv
+    row: 7
+    col: 17
+    width: 7
+    height: 3
+  - title: QTD
+    name: QTD
+    model: hdeist-test-model
+    explore: revenue
+    type: single_value
+    fields: [revenue.quarter_to_date, revenue.revenue_toggle]
+    filters:
+      revenue.product_line: "-Looker,-Looker Data Platform SaaS"
+      revenue.usage_month: 3 quarters
+      revenue.quarter_to_date: "-NULL"
+      revenue.metric_selector: blended
+    sorts: [revenue.quarter_to_date desc]
+    limit: 500
+    dynamic_fields: [{category: table_calculation, expression: "(${revenue.revenue_toggle}-offset(${revenue.revenue_toggle},1))/offset(${revenue.revenue_toggle},1)",
+        label: QoQ %, value_format: !!null '', value_format_name: percent_0, _kind_hint: measure,
+        table_calculation: qoq, _type_hint: number}]
+    query_timezone: America/Los_Angeles
+    custom_color_enabled: true
+    show_single_value_title: true
+    show_comparison: true
+    comparison_type: change
+    comparison_reverse_colors: false
+    show_comparison_label: true
+    enable_conditional_formatting: false
+    conditional_formatting_include_totals: false
+    conditional_formatting_include_nulls: false
+    x_axis_gridlines: false
+    y_axis_gridlines: true
+    show_view_names: false
+    y_axes: [{label: '', orientation: left, series: [{axisId: revenue.revenue_net_cn,
+            id: revenue.revenue_net_cn, name: 'Revenue (Net, Channel Neutral)'}],
+        showLabels: true, showValues: true, unpinAxis: true, tickDensity: default,
+        tickDensityCustom: 5, type: linear}]
+    show_y_axis_labels: true
+    show_y_axis_ticks: true
+    y_axis_tick_density: default
+    y_axis_tick_density_custom: 5
+    show_x_axis_label: true
+    show_x_axis_ticks: true
+    y_axis_scale_mode: linear
+    x_axis_reversed: false
+    y_axis_reversed: false
+    plot_size_by_field: false
+    trellis: ''
+    stacking: normal
+    limit_displayed_rows: false
+    legend_position: center
+    series_types: {}
+    point_style: none
+    show_value_labels: true
+    label_density: 25
+    x_axis_scale: auto
+    y_axis_combined: true
+    show_null_points: true
+    interpolation: linear
+    ordering: none
+    show_null_labels: false
+    show_totals_labels: false
+    show_silhouette: false
+    totals_color: "#808080"
+    defaults_version: 1
+    hidden_fields: []
+    note_state: collapsed
+    note_display: hover
+    note_text: Based on Sales Revenue
+    listen:
+      SFDC Account ID: revenue.sfdc_account_id
+      Product Group: revenue.product_group
+      GCP Revenue Source: revenue.gcp_revenue_source
+      Billing Account ID: revenue.billing_account_id
+      Logical Product (L3): revenue.logical_product_l3
+      SKU ID: revenue.sku_id
+      Sub-Account Name: vector_customers.account_name
+      Is Data Analytics? (Yes / No): revenue.is_data_analytics
+      Revenue Granularity: revenue.revenue_granularity
+      Region: revenue.region
+      EMEA Geocluster: revenue.geocluster
+      NORTHAM Sector: revenue.sector
+      Sub Region: revenue.sub_region
+      Micro Region: revenue.micro_region
+      NAL Cluster: revenue.nal_cluster
+      NAL Subcluster: vector_customers.nal_sub_cluster
+      NAL Name: revenue.nal_name
+      Reporting Account Name: revenue.reporting_account_name
+      Segment: revenue.segment
+      Digital Native vs Traditional: vector_customers.is_digital_native
+      Is ISV? (Yes / No): vector_customers.is_isv
+    row: 7
+    col: 10
+    width: 7
+    height: 3
+  - title: Navigation
+    name: Navigation
+    model: hdeist-test-model
+    explore: pommelhorse_links
+    type: looker_grid
+    fields: [pommelhorse_links.link_name]
+    filters:
+      pommelhorse_links.category: Revenue Detail
+      pommelhorse_links.link_size: 1em
+    sorts: [pommelhorse_links.link_name]
+    limit: 500
+    column_limit: 50
+    query_timezone: America/Los_Angeles
+    show_view_names: false
+    show_row_numbers: false
+    transpose: false
+    truncate_text: false
+    hide_totals: false
+    hide_row_totals: false
+    size_to_fit: true
+    table_theme: white
+    limit_displayed_rows: false
+    enable_conditional_formatting: false
+    header_text_alignment: left
+    header_font_size: '18'
+    rows_font_size: '18'
+    conditional_formatting_include_totals: false
+    conditional_formatting_include_nulls: false
+    show_sql_query_menu_options: false
+    show_totals: true
+    show_row_totals: true
+    series_labels:
+      pommelhorse_links.link_name: Navigation
+    custom_color_enabled: true
+    show_single_value_title: true
+    show_comparison: false
+    comparison_type: value
+    comparison_reverse_colors: false
+    show_comparison_label: true
+    x_axis_gridlines: false
+    y_axis_gridlines: true
+    show_y_axis_labels: true
+    show_y_axis_ticks: true
+    y_axis_tick_density: default
+    y_axis_tick_density_custom: 5
+    show_x_axis_label: true
+    show_x_axis_ticks: true
+    y_axis_scale_mode: linear
+    x_axis_reversed: false
+    y_axis_reversed: false
+    plot_size_by_field: false
+    trellis: ''
+    stacking: ''
+    legend_position: center
+    point_style: none
+    show_value_labels: false
+    label_density: 25
+    x_axis_scale: auto
+    y_axis_combined: true
+    ordering: none
+    show_null_labels: false
+    show_totals_labels: false
+    show_silhouette: false
+    totals_color: "#808080"
+    defaults_version: 1
+    series_types: {}
+    hidden_fields: []
+    y_axes: []
+    title_hidden: true
+    listen:
+      SFDC Account ID: pommelhorse_links.account_id
+      Sub-Account Name: pommelhorse_links.account_name
+      Region: pommelhorse_links.region
+      EMEA Geocluster: pommelhorse_links.geocluster
+      NORTHAM Sector: pommelhorse_links.sector
+      Sub Region: pommelhorse_links.sub_region
+      Micro Region: pommelhorse_links.micro_region
+      NAL Cluster: pommelhorse_links.nal_cluster
+      NAL Subcluster: pommelhorse_links.nal_sub_cluster
+      NAL Name: pommelhorse_links.nal_name
+      Reporting Account Name: pommelhorse_links.reporting_account_name
+    row: 0
+    col: 0
+    width: 3
+    height: 12
+  - title: 'Revenue Walk: List --> Gross'
+    name: 'Revenue Walk: List --> Gross'
+    model: hdeist-test-model
+    explore: revenue
+    type: looker_waterfall
+    fields: [revenue.revenue_list, revenue.revenue_gross]
+    filters:
+      revenue.product_line: "-Looker,-Looker Data Platform SaaS"
+      revenue.usage_year: 1 years
+      revenue.service_family: CLOUD
+    limit: 500
+    dynamic_fields: [{category: table_calculation, expression: "-1 * (${revenue.revenue_list}-${revenue.revenue_gross})",
+        label: 'Negotiated Discounts, Fraud & BMODs', value_format: "[>1000000000]$0.00,,,\\\
+          B;[>1000000]$0.00,,\\M;$0.00,\\K", value_format_name: !!null '', _kind_hint: measure,
+        table_calculation: negotiated_discounts_fraud_bmods, _type_hint: number},
+      {category: measure, expression: !!null '', label: Revenue (Gross), value_format: !!null '',
+        value_format_name: !!null '', based_on: revenue.revenue_gross, _kind_hint: measure,
+        measure: revenue_gross, type: sum, _type_hint: number}, {category: table_calculation,
+        expression: "${revenue.revenue_gross}", label: Revenue (Gross), value_format: "[>1000000000]$0.00,,,\\\
+          B;[>1000000]$0.00,,\\M;$0.00,\\K", value_format_name: !!null '', _kind_hint: measure,
+        table_calculation: revenue_gross_1, _type_hint: number, is_disabled: true}]
+    filter_expression: "${revenue.usage_date} <= ${max_date.max_date_minus_2_date}"
+    up_color: "#4285F4"
+    down_color: "#EA4335"
+    total_color: "#FBBC04"
+    show_value_labels: true
+    show_x_axis_ticks: true
+    show_x_axis_label: true
+    x_axis_scale: auto
+    show_y_axis_labels: false
+    show_y_axis_ticks: true
+    y_axis_gridlines: true
+    label_color: ["#000"]
+    x_axis_gridlines: false
+    show_view_names: false
+    y_axis_tick_density: default
+    y_axis_tick_density_custom: 5
+    y_axis_scale_mode: linear
+    x_axis_reversed: false
+    y_axis_reversed: false
+    plot_size_by_field: false
+    trellis: ''
+    stacking: ''
+    limit_displayed_rows: false
+    legend_position: center
+    point_style: none
+    label_density: 25
+    y_axis_combined: true
+    ordering: none
+    show_null_labels: false
+    show_totals_labels: false
+    show_silhouette: false
+    totals_color: "#808080"
+    defaults_version: 1
+    series_types: {}
+    hidden_fields: [revenue.revenue_gross]
+    y_axes: []
+    listen:
+      SFDC Account ID: revenue.sfdc_account_id
+      Product Group: revenue.product_group
+      GCP Revenue Source: revenue.gcp_revenue_source
+      Billing Account ID: revenue.billing_account_id
+      Logical Product (L3): revenue.logical_product_l3
+      SKU ID: revenue.sku_id
+      Sub-Account Name: vector_customers.account_name
+      Is Data Analytics? (Yes / No): revenue.is_data_analytics
+      Revenue Granularity: revenue.revenue_granularity
+      Region: revenue.region
+      EMEA Geocluster: revenue.geocluster
+      NORTHAM Sector: revenue.sector
+      Sub Region: revenue.sub_region
+      Micro Region: revenue.micro_region
+      NAL Cluster: revenue.nal_cluster
+      NAL Subcluster: vector_customers.nal_sub_cluster
+      NAL Name: revenue.nal_name
+      Reporting Account Name: revenue.reporting_account_name
+      Segment: revenue.segment
+      Digital Native vs Traditional: vector_customers.is_digital_native
+      Is ISV? (Yes / No): vector_customers.is_isv
+    row: 33
+    col: 0
+    width: 6
+    height: 16
+  - name: ''
+    type: text
+    title_text: ''
+    subtitle_text: ''
+    body_text: |-
+      <div id="discounts" style="text-align:center;font-size:1.5em">Revenue Walk</div>
+      <div style="text-align:center;font-size:1em">For more information, visit <a href="http://go/revenue-walk">go/revenue-walk</a></div>
+    row: 31
+    col: 0
+    width: 24
+    height: 2
+  - title: Top Gainers
+    name: Top Gainers
+    model: hdeist-test-model
+    explore: revenue
+    type: looker_grid
+    fields: [revenue.rolling_window_prior_window, revenue.rolling_window_current_window,
+      revenue.rolling_window_window_variance, revenue.reporting_account_name]
+    filters:
+      revenue.usage_date: 70 days
+      revenue.rolling_window: "-NULL"
+      revenue.window_size: '28'
+      revenue.rolling_window_current_window: ">=0"
+      revenue.rolling_window_prior_window: ">=0"
+      revenue.rolling_window_window_variance: ">0"
+      revenue.product_line: "-Looker,-Looker Data Platform SaaS"
+      revenue.service_family: CLOUD
+    sorts: [revenue.rolling_window_window_variance desc]
+    limit: 50
+    column_limit: 50
+    dynamic_fields: [{category: table_calculation, expression: "${revenue.rolling_window_window_variance}/${revenue.rolling_window_prior_window}",
+        label: MoM List, value_format: !!null '', value_format_name: percent_0, _kind_hint: measure,
+        table_calculation: mom_list, _type_hint: number}]
+    query_timezone: America/Los_Angeles
+    show_view_names: false
+    show_row_numbers: false
+    transpose: false
+    truncate_text: false
+    hide_totals: false
+    hide_row_totals: false
+    size_to_fit: true
+    table_theme: white
+    limit_displayed_rows: false
+    enable_conditional_formatting: true
+    header_text_alignment: left
+    header_font_size: '12'
+    rows_font_size: '12'
+    conditional_formatting_include_totals: false
+    conditional_formatting_include_nulls: false
+    show_sql_query_menu_options: false
+    column_order: [revenue.reporting_account_name, revenue.rolling_window_current_window,
+      revenue.rolling_window_prior_window, revenue.rolling_window_window_variance,
+      mom]
+    show_totals: true
+    show_row_totals: true
+    series_labels:
+      revenue.rolling_window_prior_window: 28 Days Before That
+      revenue.rolling_window_current_window: 28 Days Ago
+      revenue.rolling_window_window_variance: Sales Revenue Growth $
+      mom: Sales Revenue Growth %
+      mom_list: Sales Revenue Growth %
+    series_column_widths:
+      revenue.rolling_window: 282
+      account_meta.customer_name: 298
+    series_cell_visualizations:
+      revenue.revenue_net_cn:
+        is_active: true
+        palette:
+          palette_id: 3de02744-c6d0-ba29-2378-81b0f7919624
+          collection_id: google
+          custom_colors:
+          - "#4285F4"
+          - "#185ABC"
+    limit_displayed_rows_values:
+      show_hide: show
+      first_last: first
+      num_rows: '2'
+    header_font_color: "#5F6368"
+    conditional_formatting: [{type: greater than, value: 0, background_color: '',
+        font_color: "#137333", color_application: {collection_id: google, palette_id: google-sequential-0},
+        bold: false, italic: false, strikethrough: false, fields: [revenue.rolling_window_window_variance]},
+      {type: less than, value: 0, background_color: '', font_color: "#B31412", color_application: {
+          collection_id: google, palette_id: google-sequential-0}, bold: false, italic: false,
+        strikethrough: false, fields: [revenue.rolling_window_window_variance]}]
+    x_axis_gridlines: false
+    y_axis_gridlines: true
+    show_y_axis_labels: true
+    show_y_axis_ticks: true
+    y_axis_tick_density: default
+    y_axis_tick_density_custom: 5
+    show_x_axis_label: true
+    show_x_axis_ticks: true
+    y_axis_scale_mode: linear
+    x_axis_reversed: false
+    y_axis_reversed: false
+    plot_size_by_field: false
+    trellis: ''
+    stacking: ''
+    legend_position: center
+    point_style: none
+    show_value_labels: false
+    label_density: 25
+    x_axis_scale: auto
+    y_axis_combined: true
+    show_null_points: true
+    interpolation: linear
+    defaults_version: 1
+    series_types: {}
+    hidden_fields: [current_month_to_date]
+    ordering: none
+    show_null_labels: false
+    show_totals_labels: false
+    show_silhouette: false
+    totals_color: "#808080"
+    hidden_points_if_no: []
+    y_axes: []
+    listen:
+      SFDC Account ID: revenue.sfdc_account_id
+      Product Group: revenue.product_group
+      GCP Revenue Source: revenue.gcp_revenue_source
+      Billing Account ID: revenue.billing_account_id
+      Logical Product (L3): revenue.logical_product_l3
+      SKU ID: revenue.sku_id
+      Sub-Account Name: vector_customers.account_name
+      Is Data Analytics? (Yes / No): revenue.is_data_analytics
+      Revenue Granularity: revenue.revenue_granularity
+      Region: revenue.region
+      EMEA Geocluster: revenue.geocluster
+      NORTHAM Sector: revenue.sector
+      Sub Region: revenue.sub_region
+      Micro Region: revenue.micro_region
+      NAL Cluster: revenue.nal_cluster
+      NAL Subcluster: vector_customers.nal_sub_cluster
+      NAL Name: revenue.nal_name
+      Reporting Account Name: revenue.reporting_account_name
+      Segment: revenue.segment
+      Digital Native vs Traditional: vector_customers.is_digital_native
+      Is ISV? (Yes / No): vector_customers.is_isv
+    row: 63
+    col: 0
+    width: 12
+    height: 6
+  - title: Top Decliners
+    name: Top Decliners
+    model: hdeist-test-model
+    explore: revenue
+    type: looker_grid
+    fields: [revenue.rolling_window_prior_window, revenue.rolling_window_current_window,
+      revenue.rolling_window_window_variance, revenue.reporting_account_name]
+    filters:
+      revenue.usage_date: 70 days
+      revenue.rolling_window: "-NULL"
+      revenue.window_size: '28'
+      revenue.rolling_window_current_window: ">=0"
+      revenue.rolling_window_prior_window: ">=0"
+      revenue.rolling_window_window_variance: "<=0"
+      revenue.product_line: "-Looker,-Looker Data Platform SaaS"
+      revenue.service_family: CLOUD
+    sorts: [revenue.rolling_window_window_variance]
+    limit: 50
+    column_limit: 50
+    dynamic_fields: [{table_calculation: mom, label: MoM, expression: "${revenue.rolling_window_window_variance}/${revenue.rolling_window_prior_window}",
+        value_format: !!null '', value_format_name: percent_0, _kind_hint: measure,
+        _type_hint: number}]
+    query_timezone: America/Los_Angeles
+    show_view_names: false
+    show_row_numbers: false
+    transpose: false
+    truncate_text: false
+    hide_totals: false
+    hide_row_totals: false
+    size_to_fit: true
+    table_theme: white
+    limit_displayed_rows: false
+    enable_conditional_formatting: true
+    header_text_alignment: left
+    header_font_size: '12'
+    rows_font_size: '12'
+    conditional_formatting_include_totals: false
+    conditional_formatting_include_nulls: false
+    show_sql_query_menu_options: false
+    column_order: [revenue.reporting_account_name, revenue.rolling_window_current_window,
+      revenue.rolling_window_prior_window, revenue.rolling_window_window_variance,
+      mom]
+    show_totals: true
+    show_row_totals: true
+    series_labels:
+      revenue.rolling_window_prior_window: 28 Days Before That
+      revenue.rolling_window_current_window: 28 Days Ago
+      revenue.rolling_window_window_variance: Sales Revenue Growth $
+      mom: Sales Revenue Growth %
+    series_column_widths:
+      revenue.rolling_window: 282
+      account_meta.customer_name: 298
+    series_cell_visualizations:
+      revenue.revenue_net_cn:
+        is_active: true
+        palette:
+          palette_id: 3de02744-c6d0-ba29-2378-81b0f7919624
+          collection_id: google
+          custom_colors:
+          - "#4285F4"
+          - "#185ABC"
+    limit_displayed_rows_values:
+      show_hide: show
+      first_last: first
+      num_rows: '2'
+    header_font_color: "#5F6368"
+    conditional_formatting: [{type: greater than, value: 0, background_color: '',
+        font_color: "#137333", color_application: {collection_id: google, palette_id: google-sequential-0},
+        bold: false, italic: false, strikethrough: false, fields: [revenue.rolling_window_window_variance,
+          mom]}, {type: less than, value: 0, background_color: '', font_color: "#B31412",
+        color_application: {collection_id: google, palette_id: google-sequential-0},
+        bold: false, italic: false, strikethrough: false, fields: [revenue.rolling_window_window_variance,
+          mom]}]
+    x_axis_gridlines: false
+    y_axis_gridlines: true
+    show_y_axis_labels: true
+    show_y_axis_ticks: true
+    y_axis_tick_density: default
+    y_axis_tick_density_custom: 5
+    show_x_axis_label: true
+    show_x_axis_ticks: true
+    y_axis_scale_mode: linear
+    x_axis_reversed: false
+    y_axis_reversed: false
+    plot_size_by_field: false
+    trellis: ''
+    stacking: ''
+    legend_position: center
+    point_style: none
+    show_value_labels: false
+    label_density: 25
+    x_axis_scale: auto
+    y_axis_combined: true
+    show_null_points: true
+    interpolation: linear
+    defaults_version: 1
+    series_types: {}
+    hidden_fields: [current_month_to_date]
+    ordering: none
+    show_null_labels: false
+    show_totals_labels: false
+    show_silhouette: false
+    totals_color: "#808080"
+    hidden_points_if_no: []
+    y_axes: []
+    listen:
+      SFDC Account ID: revenue.sfdc_account_id
+      Product Group: revenue.product_group
+      GCP Revenue Source: revenue.gcp_revenue_source
+      Billing Account ID: revenue.billing_account_id
+      Logical Product (L3): revenue.logical_product_l3
+      SKU ID: revenue.sku_id
+      Sub-Account Name: vector_customers.account_name
+      Is Data Analytics? (Yes / No): revenue.is_data_analytics
+      Revenue Granularity: revenue.revenue_granularity
+      Region: revenue.region
+      EMEA Geocluster: revenue.geocluster
+      NORTHAM Sector: revenue.sector
+      Sub Region: revenue.sub_region
+      Micro Region: revenue.micro_region
+      NAL Cluster: revenue.nal_cluster
+      NAL Subcluster: vector_customers.nal_sub_cluster
+      NAL Name: revenue.nal_name
+      Reporting Account Name: revenue.reporting_account_name
+      Segment: revenue.segment
+      Digital Native vs Traditional: vector_customers.is_digital_native
+      Is ISV? (Yes / No): vector_customers.is_isv
+    row: 63
+    col: 12
+    width: 12
+    height: 6
+  - name: " (2)"
+    type: text
+    title_text: ''
+    subtitle_text: ''
+    body_text: <div style="text-align:center;font-size:1.5em"><a href="#growth"><img
+      src="https://fonts.gstatic.com/s/i/short-term/release/googlesymbols/sort/default/24px.svg">Growth</a></div>
+    row: 10
+    col: 13
+    width: 5
+    height: 2
+  - name: " (3)"
+    type: text
+    title_text: ''
+    subtitle_text: ''
+    body_text: <div id="growth" style="text-align:center;font-size:1.5em">Growth (28
+      days vs Prior 28 Days)</div>
+    row: 61
+    col: 0
+    width: 24
+    height: 2
+  - name: " (4)"
+    type: text
+    title_text: ''
+    subtitle_text: ''
+    body_text: <div style="text-align:center;font-size:1.5em"><a href="#discounts"><img
+      src="https://fonts.gstatic.com/s/i/short-term/release/googlesymbols/local_offer/default/24px.svg">Revenue
+      Walk</a></div>
+    row: 10
+    col: 8
+    width: 5
+    height: 2
+  - title: Weekly Sales Revenue Trends
+    name: Weekly Sales Revenue Trends
+    model: hdeist-test-model
+    explore: revenue
+    type: looker_line
+    fields: [revenue.usage_week, revenue.revenue_toggle]
+    fill_fields: [revenue.usage_week]
+    filters:
+      revenue.product_line: "-Looker,-Looker Data Platform SaaS"
+      revenue.usage_week: 52 weeks ago for 52 weeks
+      revenue.service_family: CLOUD
+    sorts: [revenue.usage_week desc]
+    limit: 500
+    query_timezone: America/Los_Angeles
+    x_axis_gridlines: false
+    y_axis_gridlines: true
+    show_view_names: false
+    show_y_axis_labels: true
+    show_y_axis_ticks: true
+    y_axis_tick_density: default
+    y_axis_tick_density_custom: 5
+    show_x_axis_label: false
+    show_x_axis_ticks: true
+    y_axis_scale_mode: linear
+    x_axis_reversed: false
+    y_axis_reversed: false
+    plot_size_by_field: false
+    trellis: ''
+    stacking: ''
+    limit_displayed_rows: false
+    legend_position: center
+    point_style: none
+    show_value_labels: true
+    label_density: 25
+    x_axis_scale: auto
+    y_axis_combined: true
+    show_null_points: true
+    interpolation: linear
+    y_axes: [{label: Weekly Revenue, orientation: left, series: [{axisId: revenue.revenue_toggle,
+            id: revenue.revenue_toggle, name: Revenue (Toggle-able)}], showLabels: true,
+        showValues: true, valueFormat: "[>1000000000]$0.00,,,\\B;[>1000000]$0.00,,\\\
+          M;$0,\\K", unpinAxis: true, tickDensity: default, tickDensityCustom: 5,
+        type: linear}]
+    label_value_format: "[>1000000000]$0.00,,,\\B;[>1000000]$0.00,,\\M;$0.00,\\K"
+    series_types: {}
+    ordering: none
+    show_null_labels: false
+    show_totals_labels: false
+    show_silhouette: false
+    totals_color: "#808080"
+    defaults_version: 1
+    hidden_fields: []
+    listen:
+      SFDC Account ID: revenue.sfdc_account_id
+      Product Group: revenue.product_group
+      GCP Revenue Source: revenue.gcp_revenue_source
+      Billing Account ID: revenue.billing_account_id
+      Logical Product (L3): revenue.logical_product_l3
+      SKU ID: revenue.sku_id
+      Sub-Account Name: vector_customers.account_name
+      Is Data Analytics? (Yes / No): revenue.is_data_analytics
+      Revenue Granularity: revenue.revenue_granularity
+      Region: revenue.region
+      EMEA Geocluster: revenue.geocluster
+      NORTHAM Sector: revenue.sector
+      Sub Region: revenue.sub_region
+      Micro Region: revenue.micro_region
+      NAL Cluster: revenue.nal_cluster
+      NAL Subcluster: vector_customers.nal_sub_cluster
+      NAL Name: revenue.nal_name
+      Reporting Account Name: revenue.reporting_account_name
+      Segment: revenue.segment
+      Digital Native vs Traditional: vector_customers.is_digital_native
+      Is ISV? (Yes / No): vector_customers.is_isv
+    row: 18
+    col: 0
+    width: 24
+    height: 6
+  - name: " (5)"
+    type: text
+    title_text: ''
+    subtitle_text: ''
+    body_text: |-
+      <div style="height:2em;font-size:1.5em;text-align:center"><a href="http://go/bhi-bug" target="_blank"><img src="https://fonts.gstatic.com/s/i/short-term/release/googlesymbols/bug_report/default/24px.svg
+      ">File a Bug</a></div>
+    row: 10
+    col: 3
+    width: 5
+    height: 2
+  - name: " (6)"
+    type: text
+    title_text: ''
+    subtitle_text: ''
+    body_text: |-
+      <div style="text-align:center;font-size:1.2em">
+      Missing the old <a href="https://data.corp.google.com/sites/q1yjy0md0d87/insights__trends/">Account360</a>?
+      </div>
+    row: 10
+    col: 18
+    width: 6
+    height: 2
+  - title: 'Revenue Walk: Gross --> Invoice'
+    name: 'Revenue Walk: Gross --> Invoice'
+    model: hdeist-test-model
+    explore: revenue
+    type: looker_waterfall
+    fields: [revenue.revenue_invoice, revenue.invoice_revenue_components_gross, revenue.invoice_revenue_components_ft,
+      revenue.invoice_revenue_components_sud, revenue.invoice_revenue_components_cud,
+      revenue.invoice_revenue_components_promo, revenue.invoice_revenue_components_reseller_credit,
+      revenue.invoice_revenue_components_cross_pa_credits_addback]
+    filters:
+      revenue.product_line: "-Looker,-Looker Data Platform SaaS"
+      revenue.usage_year: 1 years
+      revenue.service_family: CLOUD
+    limit: 500
+    dynamic_fields: [{category: table_calculation, expression: "-1 * (${revenue.revenue_gross}+(\n\
+          \  ${revenue.revenue_promo}+${revenue.revenue_ft}+${revenue.revenue_ft}+${revenue.revenue_reseller}+${revenue.revenue_cud}+${revenue.revenue_sud}+${revenue.revenue_cross_pa_credits}\n\
+          ) - ${revenue.revenue_invoice})", label: Discounts (Other), value_format: "$0.00,,\\\
+          M", value_format_name: !!null '', _kind_hint: measure, table_calculation: discounts_other,
+        _type_hint: number, is_disabled: true}]
+    filter_expression: "${revenue.usage_date} <= ${max_date.max_date_minus_2_date}"
+    up_color: "#4285F4"
+    down_color: "#EA4335"
+    total_color: "#FBBC04"
+    show_value_labels: true
+    show_x_axis_ticks: true
+    show_x_axis_label: true
+    x_axis_scale: auto
+    show_y_axis_labels: false
+    show_y_axis_ticks: true
+    y_axis_gridlines: true
+    label_color: ["#000"]
+    x_axis_gridlines: false
+    show_view_names: false
+    y_axis_tick_density: default
+    y_axis_tick_density_custom: 5
+    y_axis_scale_mode: linear
+    x_axis_reversed: false
+    y_axis_reversed: false
+    plot_size_by_field: false
+    trellis: ''
+    stacking: ''
+    limit_displayed_rows: false
+    legend_position: center
+    point_style: none
+    label_density: 25
+    y_axis_combined: true
+    ordering: none
+    show_null_labels: false
+    show_totals_labels: false
+    show_silhouette: false
+    totals_color: "#808080"
+    defaults_version: 1
+    series_types: {}
+    hidden_fields: [revenue.revenue_invoice]
+    y_axes: []
+    listen:
+      SFDC Account ID: revenue.sfdc_account_id
+      Product Group: revenue.product_group
+      GCP Revenue Source: revenue.gcp_revenue_source
+      Billing Account ID: revenue.billing_account_id
+      Logical Product (L3): revenue.logical_product_l3
+      SKU ID: revenue.sku_id
+      Sub-Account Name: vector_customers.account_name
+      Is Data Analytics? (Yes / No): revenue.is_data_analytics
+      Revenue Granularity: revenue.revenue_granularity
+      Region: revenue.region
+      EMEA Geocluster: revenue.geocluster
+      NORTHAM Sector: revenue.sector
+      Sub Region: revenue.sub_region
+      Micro Region: revenue.micro_region
+      NAL Cluster: revenue.nal_cluster
+      NAL Subcluster: vector_customers.nal_sub_cluster
+      NAL Name: revenue.nal_name
+      Reporting Account Name: revenue.reporting_account_name
+      Segment: revenue.segment
+      Digital Native vs Traditional: vector_customers.is_digital_native
+      Is ISV? (Yes / No): vector_customers.is_isv
+    row: 33
+    col: 6
+    width: 18
+    height: 8
+  - title: 'Revenue Walk: Gross --> Sales'
+    name: 'Revenue Walk: Gross --> Sales'
+    model: hdeist-test-model
+    explore: revenue
+    type: looker_waterfall
+    fields: [revenue.revenue_net_cn, revenue.sales_revenue_components_gross, revenue.sales_revenue_components_ft,
+      revenue.sales_revenue_components_sud, revenue.sales_revenue_components_cud,
+      revenue.sales_revenue_components_promo, revenue.sales_revenue_components_reseller_credit,
+      revenue.sales_revenue_components_cross_pa_credits_addback, revenue.sales_revenue_components_isv_deduction,
+      revenue.sales_revenue_components_partner_margin_addback]
+    filters:
+      revenue.product_line: "-Looker,-Looker Data Platform SaaS"
+      revenue.usage_year: 1 years
+      revenue.service_family: CLOUD
+    limit: 500
+    dynamic_fields: [{category: measure, expression: !!null '', label: Revenue (Gross),
+        value_format: !!null '', value_format_name: !!null '', based_on: revenue.revenue_gross,
+        _kind_hint: measure, measure: revenue_gross, type: sum, _type_hint: number},
+      {category: measure, expression: '${revenue.segment}="Corporate" OR ${revenue.region}="PUBLIC
+          SECTOR"', label: Corp & GPS Partner Margin, value_format: !!null '', value_format_name: !!null '',
+        based_on: revenue.revenue_reseller, filter_expression: '${revenue.segment}="Corporate"
+          OR ${revenue.region}="PUBLIC SECTOR"', _kind_hint: measure, measure: corp_gps_partner_margin,
+        type: sum, _type_hint: number, filters: {}}]
+    filter_expression: "${revenue.usage_date} <= ${max_date.max_date_minus_2_date}"
+    up_color: "#4285F4"
+    down_color: "#EA4335"
+    total_color: "#FBBC04"
+    show_value_labels: true
+    show_x_axis_ticks: true
+    show_x_axis_label: true
+    x_axis_scale: auto
+    show_y_axis_labels: false
+    show_y_axis_ticks: true
+    y_axis_gridlines: true
+    label_color: ["#000"]
+    x_axis_gridlines: false
+    show_view_names: false
+    y_axis_tick_density: default
+    y_axis_tick_density_custom: 5
+    y_axis_scale_mode: linear
+    x_axis_reversed: false
+    y_axis_reversed: false
+    plot_size_by_field: false
+    trellis: ''
+    stacking: ''
+    limit_displayed_rows: false
+    legend_position: center
+    point_style: none
+    label_density: 25
+    y_axis_combined: true
+    ordering: none
+    show_null_labels: false
+    show_totals_labels: false
+    show_silhouette: false
+    totals_color: "#808080"
+    defaults_version: 1
+    series_types: {}
+    hidden_fields: [revenue.revenue_net_cn]
+    y_axes: []
+    listen:
+      SFDC Account ID: revenue.sfdc_account_id
+      Product Group: revenue.product_group
+      GCP Revenue Source: revenue.gcp_revenue_source
+      Billing Account ID: revenue.billing_account_id
+      Logical Product (L3): revenue.logical_product_l3
+      SKU ID: revenue.sku_id
+      Sub-Account Name: vector_customers.account_name
+      Is Data Analytics? (Yes / No): revenue.is_data_analytics
+      Revenue Granularity: revenue.revenue_granularity
+      Region: revenue.region
+      EMEA Geocluster: revenue.geocluster
+      NORTHAM Sector: revenue.sector
+      Sub Region: revenue.sub_region
+      Micro Region: revenue.micro_region
+      NAL Cluster: revenue.nal_cluster
+      NAL Subcluster: vector_customers.nal_sub_cluster
+      NAL Name: revenue.nal_name
+      Reporting Account Name: revenue.reporting_account_name
+      Segment: revenue.segment
+      Digital Native vs Traditional: vector_customers.is_digital_native
+      Is ISV? (Yes / No): vector_customers.is_isv
+    row: 41
+    col: 6
+    width: 18
+    height: 8
+  - title: List, Gross & Sales Revenue Comparison (Weekly)
+    name: List, Gross & Sales Revenue Comparison (Weekly)
+    model: hdeist-test-model
+    explore: revenue
+    type: looker_line
+    fields: [revenue.revenue_net_cn, revenue.revenue_list, revenue.usage_week, revenue.revenue_gross,
+      revenue.revenue_cud, revenue.revenue_promo, revenue.revenue_bmod]
+    filters:
+      revenue.product_line: "-Looker,-Looker Data Platform SaaS"
+      revenue.service_family: CLOUD
+      revenue.usage_month: 12 months
+    sorts: [revenue.usage_week desc]
+    limit: 500
+    x_axis_gridlines: false
+    y_axis_gridlines: true
+    show_view_names: false
+    show_y_axis_labels: false
+    show_y_axis_ticks: true
+    y_axis_tick_density: default
+    y_axis_tick_density_custom: 5
+    show_x_axis_label: false
+    show_x_axis_ticks: true
+    y_axis_scale_mode: linear
+    x_axis_reversed: false
+    y_axis_reversed: false
+    plot_size_by_field: false
+    trellis: ''
+    stacking: ''
+    limit_displayed_rows: false
+    legend_position: center
+    point_style: none
+    show_value_labels: true
+    label_density: 25
+    x_axis_scale: auto
+    y_axis_combined: true
+    show_null_points: true
+    interpolation: linear
+    y_axes: [{label: '', orientation: left, series: [{axisId: revenue.revenue_net_cn,
+            id: revenue.revenue_net_cn, name: Revenue (Sales)}, {axisId: revenue.revenue_list,
+            id: revenue.revenue_list, name: "[go/listrev] Revenue (List)"}, {axisId: revenue.revenue_gross,
+            id: revenue.revenue_gross, name: Revenue (Gross)}, {axisId: revenue.revenue_cud,
+            id: revenue.revenue_cud, name: Revenue (Committed Usage Discount)}, {
+            axisId: revenue.revenue_promo, id: revenue.revenue_promo, name: Revenue
+              (Promo)}, {axisId: revenue.revenue_bmod, id: revenue.revenue_bmod, name: Revenue
+              (Billing Modifications)}], showLabels: false, showValues: true, minValue: !!null '',
+        valueFormat: "[>=1000000000]$0.0,,,\\B;[>1000000]$0.0,,\\M;$0.0,\\K", unpinAxis: true,
+        tickDensity: default, tickDensityCustom: 5, type: linear}]
+    hidden_series: []
+    label_value_format: "[>1000000000]$0.00,,,\\B;[>1000000]$0.0,,\\M;$0.0,\\K"
+    series_types: {}
+    label_color: []
+    ordering: none
+    show_null_labels: false
+    show_totals_labels: true
+    show_silhouette: false
+    totals_color: "#808080"
+    up_color: "#4285F4"
+    down_color: "#EA4335"
+    total_color: "#FBBC04"
+    defaults_version: 1
+    hidden_fields: []
+    listen:
+      SFDC Account ID: revenue.sfdc_account_id
+      Product Group: revenue.product_group
+      GCP Revenue Source: revenue.gcp_revenue_source
+      Billing Account ID: revenue.billing_account_id
+      Logical Product (L3): revenue.logical_product_l3
+      SKU ID: revenue.sku_id
+      Sub-Account Name: vector_customers.account_name
+      Is Data Analytics? (Yes / No): revenue.is_data_analytics
+      Revenue Granularity: revenue.revenue_granularity
+      Region: revenue.region
+      EMEA Geocluster: revenue.geocluster
+      NORTHAM Sector: revenue.sector
+      Sub Region: revenue.sub_region
+      Micro Region: revenue.micro_region
+      NAL Cluster: revenue.nal_cluster
+      NAL Subcluster: vector_customers.nal_sub_cluster
+      NAL Name: revenue.nal_name
+      Reporting Account Name: revenue.reporting_account_name
+      Segment: revenue.segment
+      Digital Native vs Traditional: vector_customers.is_digital_native
+      Is ISV? (Yes / No): vector_customers.is_isv
+    row: 49
+    col: 0
+    width: 24
+    height: 12
+  - title: Most Recent Revenue Data
+    name: Most Recent Revenue Data
+    model: hdeist-test-model
+    explore: revenue
+    type: single_value
+    fields: [revenue.usage_date, revenue.revenue_net_cn]
+    fill_fields: [revenue.usage_date]
+    filters:
+      revenue.product_line: "-Looker,-Looker Data Platform SaaS"
+      revenue.service_family: CLOUD
+      revenue.usage_date: 30 days
+    sorts: [revenue.usage_date desc]
+    limit: 500
+    dynamic_fields: [{category: table_calculation, expression: "(${revenue.revenue_toggle}-offset(${revenue.revenue_toggle},1))/offset(${revenue.revenue_toggle},1)",
+        label: YoY %, value_format: !!null '', value_format_name: percent_0, _kind_hint: measure,
+        table_calculation: yoy, _type_hint: number, is_disabled: true}, {category: table_calculation,
+        expression: "${revenue.revenue_net_cn} > 0.5 * median(${revenue.revenue_net_cn})",
+        label: 'Is valid row?', value_format: "$0.00,\\K", value_format_name: !!null '',
+        _kind_hint: measure, table_calculation: is_valid_row, _type_hint: yesno}]
+    query_timezone: America/Los_Angeles
+    custom_color_enabled: true
+    show_single_value_title: true
+    show_comparison: false
+    comparison_type: change
+    comparison_reverse_colors: false
+    show_comparison_label: true
+    enable_conditional_formatting: false
+    conditional_formatting_include_totals: false
+    conditional_formatting_include_nulls: false
+    x_axis_gridlines: false
+    y_axis_gridlines: true
+    show_view_names: false
+    y_axes: [{label: '', orientation: left, series: [{axisId: revenue.revenue_net_cn,
+            id: revenue.revenue_net_cn, name: 'Revenue (Net, Channel Neutral)'}],
+        showLabels: true, showValues: true, unpinAxis: true, tickDensity: default,
+        tickDensityCustom: 5, type: linear}]
+    show_y_axis_labels: true
+    show_y_axis_ticks: true
+    y_axis_tick_density: default
+    y_axis_tick_density_custom: 5
+    show_x_axis_label: true
+    show_x_axis_ticks: true
+    y_axis_scale_mode: linear
+    x_axis_reversed: false
+    y_axis_reversed: false
+    plot_size_by_field: false
+    trellis: ''
+    stacking: normal
+    limit_displayed_rows: false
+    legend_position: center
+    series_types: {}
+    point_style: none
+    show_value_labels: true
+    label_density: 25
+    x_axis_scale: auto
+    y_axis_combined: true
+    show_null_points: true
+    interpolation: linear
+    ordering: none
+    show_null_labels: false
+    show_totals_labels: false
+    show_silhouette: false
+    totals_color: "#808080"
+    defaults_version: 1
+    hidden_fields: [revenue.revenue_net_cn]
+    hidden_points_if_no: [is_valid_row]
+    note_state: collapsed
+    note_display: hover
+    note_text: Most recent date with complete revenue numbers
+    listen:
+      SFDC Account ID: revenue.sfdc_account_id
+      Product Group: revenue.product_group
+      GCP Revenue Source: revenue.gcp_revenue_source
+      Billing Account ID: revenue.billing_account_id
+      Logical Product (L3): revenue.logical_product_l3
+      SKU ID: revenue.sku_id
+      Sub-Account Name: vector_customers.account_name
+      Is Data Analytics? (Yes / No): revenue.is_data_analytics
+      Revenue Granularity: revenue.revenue_granularity
+      Region: revenue.region
+      EMEA Geocluster: revenue.geocluster
+      NORTHAM Sector: revenue.sector
+      Sub Region: revenue.sub_region
+      Micro Region: revenue.micro_region
+      NAL Cluster: revenue.nal_cluster
+      NAL Subcluster: vector_customers.nal_sub_cluster
+      NAL Name: revenue.nal_name
+      Reporting Account Name: revenue.reporting_account_name
+      Segment: revenue.segment
+      Digital Native vs Traditional: vector_customers.is_digital_native
+      Is ISV? (Yes / No): vector_customers.is_isv
+    row: 4
+    col: 3
+    width: 7
+    height: 3
   # - title: QTD (GCP Core + Looker + Apigee)
   #   name: QTD (GCP Core + Looker + Apigee)
-  #   model: cloud_sales_bi
+  #   model: hdeist-test-model
   #   explore: gcp_forecast_quotas_transformed
   #   type: single_value
   #   fields: [gcp_forecast_quotas_transformed.revenue_net_cn]
@@ -1411,7 +1411,7 @@
   #   show_row_totals: true
   #   series_labels:
   #     gcp_forecast_quotas_transformed.forecast_vs_quota_called_revenue: Called Forecast
-  #       vs. Quota
+  #       vs Quota
   #     revenue.revenue_net_cn: Sales Revenue Actuals
   #     gcp_forecast_quotas_transformed.quota_revenue: Quota
   #     gcp_forecast_quotas_transformed.total_called_revenue_forecast: Called Forecast
@@ -1505,36 +1505,36 @@
   #     NAL Name: gcp_forecast_quotas_transformed.nal_name
   #     Reporting Account Name: gcp_forecast_quotas_transformed.reporting_account_name
   #     Segment: vector_customers.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
+  #     Digital Native vs Traditional: vector_customers.is_digital_native
   #     Is ISV? (Yes / No): vector_customers.is_isv
   #   row: 0
   #   col: 10
   #   width: 7
   #   height: 4
-  # - name: " (7)"
-  #   type: text
-  #   title_text: ''
-  #   subtitle_text: ''
-  #   body_text: <div style="font-size:2em;text-align:center">All other tiles represent
-  #     <b>GCP Core only</b> and do not include Looker or Apigee Revenue.</div>
-  #   row: 4
-  #   col: 10
-  #   width: 14
-  #   height: 3
-  # - name: " (8)"
-  #   type: text
-  #   title_text: ''
-  #   subtitle_text: ''
-  #   body_text: |-
-  #     <div style="font-size:1.5em"><img style="float:left" height=100 src="https://fonts.gstatic.com/s/i/short-term/release/googlesymbols/west/default/24px.svg">
-  #     These tiles represent <b>GCP Core + Looker + Apigee</b> and match values on <a href="http://go/bhi">go/bhi</a>.</div>
-  #   row: 0
-  #   col: 17
-  #   width: 7
-  #   height: 4
+  - name: " (7)"
+    type: text
+    title_text: ''
+    subtitle_text: ''
+    body_text: <div style="font-size:2em;text-align:center">All other tiles represent
+      <b>GCP Core only</b> and do not include Looker or Apigee Revenue.</div>
+    row: 4
+    col: 10
+    width: 14
+    height: 3
+  - name: " (8)"
+    type: text
+    title_text: ''
+    subtitle_text: ''
+    body_text: |-
+      <div style="font-size:1.5em"><img style="float:left" height=100 src="https://fonts.gstatic.com/s/i/short-term/release/googlesymbols/west/default/24px.svg">
+      These tiles represent <b>GCP Core + Looker + Apigee</b> and match values on <a href="http://go/bhi">go/bhi</a>.</div>
+    row: 0
+    col: 17
+    width: 7
+    height: 4
   # - title: YTD (GCP Core + Looker + Apigee)
   #   name: YTD (GCP Core + Looker + Apigee)
-  #   model: cloud_sales_bi
+  #   model: hdeist-test-model
   #   explore: gcp_forecast_quotas_transformed
   #   type: single_value
   #   fields: [gcp_forecast_quotas_transformed.revenue_net_cn]
@@ -1572,7 +1572,7 @@
   #   show_row_totals: true
   #   series_labels:
   #     gcp_forecast_quotas_transformed.forecast_vs_quota_called_revenue: Called Forecast
-  #       vs. Quota
+  #       vs Quota
   #     revenue.revenue_net_cn: Sales Revenue Actuals
   #     gcp_forecast_quotas_transformed.quota_revenue: Quota
   #     gcp_forecast_quotas_transformed.total_called_revenue_forecast: Called Forecast
@@ -1666,7 +1666,7 @@
   #     NAL Name: gcp_forecast_quotas_transformed.nal_name
   #     Reporting Account Name: gcp_forecast_quotas_transformed.reporting_account_name
   #     Segment: vector_customers.segment
-  #     Digital Native vs. Traditional: vector_customers.is_digital_native
+  #     Digital Native vs Traditional: vector_customers.is_digital_native
   #     Is ISV? (Yes / No): vector_customers.is_isv
   #   row: 0
   #   col: 3
@@ -1675,12 +1675,6 @@
 
 
 
-
-
-
-
-
-
   filters:
   - name: Region
     title: Region
diff --git a/views/revenue/revenue_from_revenue.view.lkml b/views/revenue/revenue_from_revenue.view.lkml
index 59ec8f2..a32ab62 100644
--- a/views/revenue/revenue_from_revenue.view.lkml
+++ b/views/revenue/revenue_from_revenue.view.lkml
@@ -1,4 +1,13 @@
-# emulates https://lookercs-internal.git.corp.google.com/cloud_sales_bi/+/refs/heads/master/views/revenue/revenue_from_revenue.view.lkml
+########################################################
+#
+# Author: hillz@
+# Updated Date: Oct 6, 2021 Def.
+# Fields related to "Revenue" from the revenue table
+# Meant to be extended into the revenue view
+# Primary key will be in the primary (revenue) view
+#
+########################################################
+
 view: revenue_from_revenue {
 
   extension: required
@@ -139,6 +148,7 @@
     sql: ${TABLE}.product_group ;;
     drill_fields: [product_line]
   }
+
   dimension: product_line {
     group_label: "Legacy Product Hierarchy"
     view_label: "Product"
@@ -157,94 +167,92 @@
     hidden: yes
     group_label: "Legacy Product Hierarchy"
     view_label: "Product"
-    sql: ${TABLE}.product_line;;
-    #drill_fields: [sku_description]
+    sql: {% if project_number._in_query %} ${TABLE}.product_name
+         {% elsif project_name._in_query %} ${TABLE}.product_name
+         {% elsif project_id._in_query %} ${TABLE}.product_name
+         {% elsif sku_id._in_query %} ${TABLE}.product_name
+         {% elsif sku_description._in_query %} ${TABLE}.product_name
+         {% elsif machine_type._in_query %} ${TABLE}.product_name
+         {% elsif resource_group._in_query %} ${TABLE}.product_name
+         {% elsif storage_locality._in_query %} ${TABLE}.product_name
+         {% elsif storage_class._in_query %} ${TABLE}.product_name
+         {% elsif usage_location._in_query %} ${TABLE}.product_name
+         {% elsif usage_unit._in_query %} ${TABLE}.product_name
+         {% elsif usage_in_usage_units._in_query %} ${TABLE}.product_name
+         {% else %} ${TABLE}.product_line {% endif %} ;;
+    drill_fields: [sku_description]
   }
 
-  # dimension: product_line_raw {
-  #   hidden: yes
-  #   group_label: "Legacy Product Hierarchy"
-  #   view_label: "Product"
-  #   sql: {% if project_number._in_query %} ${TABLE}.product_name
-  #       {% elsif project_name._in_query %} ${TABLE}.product_name
-  #       {% elsif project_id._in_query %} ${TABLE}.product_name
-  #       {% elsif sku_id._in_query %} ${TABLE}.product_name
-  #       {% elsif sku_description._in_query %} ${TABLE}.product_name
-  #       {% elsif machine_type._in_query %} ${TABLE}.product_name
-  #       {% elsif resource_group._in_query %} ${TABLE}.product_name
-  #       {% elsif storage_locality._in_query %} ${TABLE}.product_name
-  #       {% elsif storage_class._in_query %} ${TABLE}.product_name
-  #       {% elsif usage_location._in_query %} ${TABLE}.product_name
-  #       {% elsif usage_unit._in_query %} ${TABLE}.product_name
-  #       {% elsif usage_in_usage_units._in_query %} ${TABLE}.product_name
-  #       {% else %} ${TABLE}.product_line {% endif %} ;;
-  #   drill_fields: [sku_description]
-  # }
-  # dimension: product_specialization {
-  #   view_label: "Product"
-  #   sql: {% if project_number._in_query %} ${TABLE}.specialization
-  #       {% elsif project_name._in_query %} ${TABLE}.specialization
-  #       {% elsif project_id._in_query %} ${TABLE}.specialization
-  #       {% elsif sku_id._in_query %} ${TABLE}.specialization
-  #       {% elsif sku_description._in_query %} ${TABLE}.specialization
-  #       {% elsif machine_type._in_query %} ${TABLE}.specialization
-  #       {% elsif resource_group._in_query %} ${TABLE}.specialization
-  #       {% elsif storage_locality._in_query %} ${TABLE}.specialization
-  #       {% elsif storage_class._in_query %} ${TABLE}.specialization
-  #       {% elsif usage_location._in_query %} ${TABLE}.specialization
-  #       {% elsif usage_unit._in_query %} ${TABLE}.specialization
-  #       {% elsif usage_in_usage_units._in_query %} ${TABLE}.specialization
-  #       {% else %} ${TABLE}.product_specialization {% endif %} ;;
-  #   drill_fields: [sku_description]
-  # }
+  dimension: product_specialization {
+    view_label: "Product"
+    sql: {% if project_number._in_query %} ${TABLE}.specialization
+         {% elsif project_name._in_query %} ${TABLE}.specialization
+         {% elsif project_id._in_query %} ${TABLE}.specialization
+         {% elsif sku_id._in_query %} ${TABLE}.specialization
+         {% elsif sku_description._in_query %} ${TABLE}.specialization
+         {% elsif machine_type._in_query %} ${TABLE}.specialization
+         {% elsif resource_group._in_query %} ${TABLE}.specialization
+         {% elsif storage_locality._in_query %} ${TABLE}.specialization
+         {% elsif storage_class._in_query %} ${TABLE}.specialization
+         {% elsif usage_location._in_query %} ${TABLE}.specialization
+         {% elsif usage_unit._in_query %} ${TABLE}.specialization
+         {% elsif usage_in_usage_units._in_query %} ${TABLE}.specialization
+         {% else %} ${TABLE}.product_specialization {% endif %} ;;
+    drill_fields: [sku_description]
+  }
+
   dimension: service_family {
     view_label: "Product"
     description: "Service family, i.e. CLOUD or GEO"
     type: string
     sql: ${TABLE}.service_family ;;
   }
-  # dimension: storage_class {
-  #   view_label: "Product"
-  #   group_label: "Cloud Storage"
-  #   description: "Groups Cloud Storage into Archive, Coldline, Nearline, and Standard based on sku description."
-  #   case: {
-  #     when: {
-  #       sql: ${product_line_raw} = "Cloud Storage" AND ${sku_description} LIKE '%Archive%' ;;
-  #       label: "Archive"
-  #     }
-  #     when: {
-  #       sql: ${product_line_raw} = "Cloud Storage" AND ${sku_description} LIKE '%Coldline%' ;;
-  #       label: "Coldline"
-  #     }
-  #     when: {
-  #       sql: ${product_line_raw} = "Cloud Storage" AND ${sku_description} LIKE '%Nearline%' ;;
-  #       label: "Nearline"
-  #     }
-  #     when: {
-  #       sql: ${product_line_raw} = "Cloud Storage" ;;
-  #       label: "Standard"
-  #     }
-  #   }
-  # }
-  # dimension: storage_locality {
-  #   view_label: "Product"
-  #   group_label: "Cloud Storage"
-  #   description: "Groups Cloud Storage into Multi-Region, Dual-Region, or Regional based on sku description."
-  #   case: {
-  #     when: {
-  #       sql: ${product_line_raw} = "Cloud Storage" AND ${sku_description} LIKE '%Multi%' ;;
-  #       label: "Multi-Region"
-  #     }
-  #     when: {
-  #       sql: ${product_line_raw} = "Cloud Storage" AND ${sku_description} LIKE '%Dual%' ;;
-  #       label: "Dual-Region"
-  #     }
-  #     when: {
-  #       sql: ${product_line_raw} = "Cloud Storage" ;;
-  #       label: "Regional"
-  #     }
-  #   }
-  # }
+
+  dimension: storage_class {
+    view_label: "Product"
+    group_label: "Cloud Storage"
+    description: "Groups Cloud Storage into Archive, Coldline, Nearline, and Standard based on sku description."
+    case: {
+      when: {
+        sql: ${product_line_raw} = "Cloud Storage" AND ${sku_description} LIKE '%Archive%' ;;
+        label: "Archive"
+      }
+      when: {
+        sql: ${product_line_raw} = "Cloud Storage" AND ${sku_description} LIKE '%Coldline%' ;;
+        label: "Coldline"
+      }
+      when: {
+        sql: ${product_line_raw} = "Cloud Storage" AND ${sku_description} LIKE '%Nearline%' ;;
+        label: "Nearline"
+      }
+      when: {
+        sql: ${product_line_raw} = "Cloud Storage" ;;
+        label: "Standard"
+      }
+    }
+  }
+
+  dimension: storage_locality {
+    view_label: "Product"
+    group_label: "Cloud Storage"
+    description: "Groups Cloud Storage into Multi-Region, Dual-Region, or Regional based on sku description."
+    case: {
+      when: {
+        sql: ${product_line_raw} = "Cloud Storage" AND ${sku_description} LIKE '%Multi%' ;;
+        label: "Multi-Region"
+      }
+      when: {
+        sql: ${product_line_raw} = "Cloud Storage" AND ${sku_description} LIKE '%Dual%' ;;
+        label: "Dual-Region"
+      }
+      when: {
+        sql: ${product_line_raw} = "Cloud Storage" ;;
+        label: "Regional"
+      }
+    }
+  }
+
+
   dimension_group: usage {
     type: time
     timeframes: [raw, day_of_month, day_of_year, day_of_week, date, week, month, month_name, quarter, quarter_of_year, year]
@@ -254,6 +262,7 @@
     datatype: date
     convert_tz: no
   }
+
   dimension: usd_revenue_blended {
     hidden: yes
     view_label: "Revenue"
@@ -264,56 +273,78 @@
       {% endif %}
       ;;
   }
+
   dimension: usd_revenue_bmod {
     hidden: yes
     view_label: "Revenue"
     sql: ${TABLE}.usd_revenue_bmod ;;
   }
+
+  dimension: usd_revenue_sales {
+    hidden: yes
+    view_label: "Revenue"
+    sql: ${TABLE}.usd_revenue_metrics.sales_revenue.sales_revenue ;;
+  }
+
+  dimension: usd_revenue_invoice {
+    hidden: yes
+    view_label: "Revenue"
+    sql: ${TABLE}.usd_revenue_metrics.invoice_revenue.invoice_revenue ;;
+  }
+
   dimension: usd_revenue_cross_pa_credits {
     hidden: yes
     description: "Added to usd_revenue_net_cn to create GCP Actuals"
     sql: ${TABLE}.usd_revenue_cross_pa_credits ;;
   }
+
   dimension: usd_revenue_cud {
     hidden: yes
     view_label: "Revenue"
     description: "Committed Usage Discount credits applied against the _gross amount, reported in USD($) using a monthly Ceilometer exchange rate."
     sql: ${TABLE}.usd_revenue_cud ;;
   }
+
   dimension: usd_revenue_ft {
     hidden: yes
     view_label: "Revenue"
     description: "Free Trial credit applied against the _gross amount, reported in USD($) using a monthly Ceilometer exchange rate."
     sql: ${TABLE}.usd_revenue_ft ;;
   }
+
   dimension: usd_revenue_gross {
     hidden: yes
     view_label: "Revenue"
     description: "Monetised value for resource consumption, before application of any credits, reported in USD($) using a monthly Ceilometer exchange rate. (Generally a positive number)"
     sql: ${TABLE}.usd_revenue_gross ;;
   }
+
   dimension: usd_revenue_gross_cn {
     hidden: yes
     view_label: "Revenue"
     sql: ${TABLE}.usd_revenue_gross_cn ;;
   }
+
   dimension: usd_revenue_list {
     hidden: yes
     view_label: "Revenue"
     sql: ${TABLE}.usd_revenue_list ;;
   }
+
   dimension: usd_revenue_net {
     hidden: yes
     view_label: "Revenue"
     description: "Final billed amounts after application of all other credits, reported in USD($) using an annual exchange rate. (Net amounts are normally positive or round to zero, but it some cases credits can exceed gross and net will be negative)"
     sql: ${TABLE}.usd_revenue_net ;;
   }
+
   dimension: usd_revenue_ntg {
     hidden: yes
     view_label: "Revenue"
     description: "Net to Google Revenue"
     sql: ${TABLE}.usd_revenue_ntg ;;
   }
+
   dimension: usd_revenue_net_cn {
     hidden: yes
     view_label: "Revenue"
@@ -324,66 +355,213 @@
       {% endif %}
       ;;
   }
+
   dimension: usd_revenue_promo {
     hidden: yes
     view_label: "Revenue"
     description: "Other promotional credits applied against the _gross amount, reported in USD($) using a monthly Ceilometer exchange rate."
     sql: ${TABLE}.usd_revenue_promo ;;
   }
+
   dimension: usd_revenue_protected_credit {
     hidden: yes
     view_label: "Revenue"
     sql: ${TABLE}.usd_revenue_protected_credit ;;
   }
+
   dimension: usd_revenue_reseller {
     hidden: yes
     view_label: "Revenue"
     sql: ${TABLE}.usd_revenue_reseller ;;
   }
-  dimension: usd_revenue_rvp {
-    hidden: yes
-    view_label: "Revenue"
-    description: "Revenue for RVPs: see go/revenue-walk for details"
-    sql: ${TABLE}.usd_revenue_rvp ;;
-  }
+
   dimension: usd_revenue_sud {
     hidden: yes
     view_label: "Revenue"
     description: " Usage Discount credits applied against the _gross amount, reported in USD($) using a monthly Ceilometer exchange rate."
     sql: ${TABLE}.usd_revenue_sud ;;
   }
+
   dimension: is_nonmetered {
     type: yesno
     label: "Is Nonmetered?"
     view_label: "Product"
     sql: ${TABLE}.is_nonmetered ;;
   }
+
+  ## Metric Components
+
+  # Invoice Revenue
+
+  dimension: usd_invoice_revenue_components_gross {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    description: "Gross Revenue component of Invoice Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.invoice_revenue.components.revenue_gross ;;
+  }
+
+  dimension: usd_invoice_revenue_components_sud {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    description: "SUD component of Invoice Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.invoice_revenue.components.revenue_sud ;;
+  }
+
+  dimension: usd_invoice_revenue_components_cud {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    description: "CUD component of Invoice Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.invoice_revenue.components.revenue_cud ;;
+  }
+
+  dimension: usd_invoice_revenue_components_ft {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    description: "FT component of Invoice Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.invoice_revenue.components.revenue_ft ;;
+  }
+
+  dimension: usd_invoice_revenue_components_promo {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    description: "Promo component of Invoice Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.invoice_revenue.components.revenue_promo ;;
+  }
+
+  dimension: usd_invoice_revenue_components_reseller_credit {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    description: "Reseller Credit component of Invoice Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.invoice_revenue.components.revenue_reseller_credit ;;
+  }
+
+  dimension: usd_invoice_revenue_components_cross_pa_credits_addback {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    description: "xPA component of Invoice Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.invoice_revenue.components.cross_pa_credits_addback ;;
+  }
+
+## Metric Components
+
+# Sales Revenue
+
+  dimension: usd_sales_revenue_components_gross {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    description: "Gross Revenue component of Sales Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.sales_revenue.components.revenue_gross ;;
+  }
+
+  dimension: usd_sales_revenue_components_sud {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    description: "SUD component of Sales Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.sales_revenue.components.revenue_sud ;;
+  }
+
+  dimension: usd_sales_revenue_components_cud {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    description: "CUD component of Sales Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.sales_revenue.components.revenue_cud ;;
+  }
+
+  dimension: usd_sales_revenue_components_ft {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    description: "FT component of Sales Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.sales_revenue.components.revenue_ft ;;
+  }
+
+  dimension: usd_sales_revenue_components_promo {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    description: "Promo component of Sales Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.sales_revenue.components.revenue_promo ;;
+  }
+
+  dimension: usd_sales_revenue_components_reseller_credit {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    description: "Reseller Credit component of Sales Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.sales_revenue.components.revenue_reseller_credit ;;
+  }
+
+  dimension: usd_sales_revenue_components_cross_pa_credits_addback {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    description: "xPA component of Sales Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.sales_revenue.components.cross_pa_credits_addback ;;
+  }
+
+  dimension: usd_sales_revenue_components_partner_margin_addback {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    description: "Partner Margin addback component of Sales Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.sales_revenue.components.partner_margin_addback ;;
+  }
+
+
+  dimension: usd_sales_revenue_components_isv_tier {
+    hidden:  no
+    label: "ISV Tier"
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    description: "ISV tier used to calculate marketplace tier adjustment in Sales Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.sales_revenue.components.isv_tier ;;
+  }
+
+  dimension: usd_sales_revenue_components_isv_deduction {
+    hidden:  yes
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    description: "Marketplace ISV deduction in Sales Revenue calculation."
+    sql: ${TABLE}.usd_revenue_metrics.sales_revenue.components.isv_deduction ;;
+  }
+
+
   #### MEASURES ####
   measure: revenue_invoice {
     alias: [revenue_actuals]
     label: "Revenue (Invoice)"
     view_label: "Revenue"
-    description: "Sum of Revenue (Sales) minus hug credits. Post alignment we have agreed to keep only one source of truth for revenue and it will be gcc.revenue. Gcp_consumpiton will be deprecated but another table(with adjustments) will be established to enable the bridge from gcc.revenue to finance."
+    description: "Invoice Revenue, aligned with go/revenue-walk."
     type: sum
-    sql: ${usd_revenue_net} - ${usd_revenue_cross_pa_credits};;
+    sql: ${usd_revenue_invoice};;
     value_format_name: usd_0
-    drill_fields: [billing_account_id, revenue_actuals, revenue_net_cn]
+    drill_fields: [reporting_account_name, billing_account_id, revenue_invoice, revenue_net_cn]
     link: {
-      url: "{{ link | replace: \"billing_account_id\", \"product_line\" }}&limit=10"
+      url: "{{ link | replace: \"revenue.reporting_account_name,revenue.billing_account_id\", \"revenue.product_line\" }}&limit=10"
       label: "Top 10 Product Lines"
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
     link: {
       url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
-      {{ link | replace: column_name, \"=revenue.nal_name,revenue.reporting_account_name\" }}&limit=10&sorts={{ _field._name }}+desc
+      {% assign column_name = \"\" | append: _view._name | append: \".billing_account_id\" %}
+      {{ link | replace: column_name, \"=\" }}&limit=10&sorts={{ _field._name }}+desc
       "
       label: "Top 10 Accounts"
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
     link: {
       url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
       {{ link | replace: column_name, \"=revenue.segment\" }}&limit=10&sorts={{ _field._name }}+desc
       "
       label: "Drill by Segment"
@@ -391,15 +569,15 @@
     }
     link: {
       url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
-      {{ link | replace: column_name, \"=revenue.account_category\" }}&limit=10&sorts={{ _field._name }}+desc
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
+      {{ link | replace: column_name, \"=vector_customers.is_digital_native\" }}&limit=10&sorts={{ _field._name }}+desc
       "
       label: "Drill by Account Category"
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
     link: {
       url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
       {{ link | replace: column_name, \"=revenue.region\" }}&limit=10&sorts={{ _field._name }}+desc
       "
       label: "Drill by Region"
@@ -407,20 +585,21 @@
     }
     link: {
       url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
       {{ link | replace: column_name, \"=revenue.region,revenue.sub_region,revenue.micro_region,revenue.nal_cluster,revenue.nal_name,revenue.nal_id\" }}&sorts={{ _field._name }}+desc
       "
       label: "Drill by NAL"
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
     link: {
-      url: "{{ link | replace: \"billing_account_id\", \"product_group\" }}"
+      url: "{{ link | replace: \"revenue.reporting_account_name,revenue.billing_account_id\", \"revenue.product_group\" }}"
       label: "Drill by Product Group"
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
     # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
     # html: @{custom_dollar_formatting} ;;
   }
+
   measure: revenue_bmod {
     group_label: "Discounts, Credits & BMODS"
     label: "Revenue (Billing Modifications)"
@@ -433,6 +612,7 @@
     # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
     # html: @{custom_dollar_formatting} ;;
   }
+
   measure: revenue_cross_pa_credits {
     group_label: "Discounts, Credits & BMODS"
     label: "Revenue (xPA Credits)"
@@ -445,6 +625,7 @@
     # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
     # html: @{custom_dollar_formatting} ;;
   }
+
   measure: revenue_cud {
     group_label: "Discounts, Credits & BMODS"
     label: "Revenue (Committed Usage Discount)"
@@ -457,6 +638,7 @@
     # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
     # html: @{custom_dollar_formatting} ;;
   }
+
   measure: revenue_discounts_other {
     group_label: "Discounts, Credits & BMODS"
     label: "Revenue (Other Discounts)"
@@ -465,14 +647,16 @@
     type: sum
     sql: -1 * (${usd_revenue_gross} - ${usd_revenue_blended} + ${usd_revenue_cud} + ${usd_revenue_ft} + ${usd_revenue_promo} + ${usd_revenue_sud} +${usd_revenue_reseller}) ;;
     value_format_name: usd_0
-    drill_fields: [billing_account_id
+    drill_fields: [reporting_account_name
+      , billing_account_id
       , revenue_discounts_other
       , revenue_gross
       , revenue_net_cn
     ]
     # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
-    # html: @{custom_dollar_formatting} ;;
+    #html: @{custom_dollar_formatting} ;;
   }
+
   measure: revenue_ft {
     group_label: "Discounts, Credits & BMODS"
     label: "Revenue (Free Trial)"
@@ -485,6 +669,7 @@
     # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
     # html: @{custom_dollar_formatting} ;;
   }
+
   measure: revenue_gross {
     label: "Revenue (Gross)"
     view_label: "Revenue"
@@ -546,6 +731,7 @@
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
   }
+
   measure: revenue_list {
     label: "[go/listrev] Revenue (List)"
     view_label: "Revenue"
@@ -611,6 +797,9 @@
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
   }
+
+  # TODO: delete this measure during a scheduled maintenance window, and replace with a measure pointing to `usd_revenue_net_cn` directly
+
   measure: revenue_net_cn {
     label: "Revenue (Sales)"
     view_label: "Revenue"
@@ -680,6 +869,81 @@
     # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
     # html: @{custom_dollar_formatting} ;;
   }
+
+
+  # TODO: unhide this measure once we have re-pointed usd_revenue_net_cn
+
+  measure: revenue_sales {
+    label: "Revenue (Sales)"
+    hidden:  no
+    view_label: "Revenue"
+    description: "Sales Revenue, aligned with go/revenue-walk."
+    type: sum
+    sql: ${usd_revenue_sales};;
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, revenue_sales]
+    link: {
+      url: "{{ link | replace: \"revenue.reporting_account_name,revenue.billing_account_id\", \"revenue.product_line\" }}&limit=10"
+      label: "Top 10 Product Lines"
+      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
+    }
+    link: {
+      url: "
+      {% assign column_name = \"\" | append: _view._name | append: \".billing_account_id\" %}
+      {{ link | replace: column_name, \"=\" }}&limit=10&sorts={{ _field._name }}+desc
+      "
+      label: "Top 10 Accounts"
+      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
+    }
+    link: {
+      url: "
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
+      {{ link | replace: column_name, \"=revenue.product_group,revenue.sku_id,revenue.sku_description\" }}&limit=10&sorts={{ _field._name }}+desc
+      "
+      label: "Top 10 SKUs"
+      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
+    }
+    link: {
+      url: "
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
+      {{ link | replace: column_name, \"=revenue.segment\" }}&limit=10&sorts={{ _field._name }}+desc
+      "
+      label: "Drill by Segment"
+      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
+    }
+    link: {
+      url: "
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
+      {{ link | replace: column_name, \"=vector_customers.is_digital_native\" }}&limit=10&sorts={{ _field._name }}+desc
+      "
+      label: "Drill by Account Category"
+      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
+    }
+    link: {
+      url: "
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
+      {{ link | replace: column_name, \"=revenue.region\" }}&limit=10&sorts={{ _field._name }}+desc
+      "
+      label: "Drill by Region"
+      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
+    }
+    link: {
+      url: "
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
+      {{ link | replace: column_name, \"=revenue.region,revenue.sub_region,revenue.micro_region,revenue.nal_cluster,revenue.nal_name,revenue.nal_id\" }}&sorts={{ _field._name }}+desc
+      "
+      label: "Drill by NAL"
+      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
+    }
+    link: {
+      url: "{{ link | replace: \"revenue.reporting_account_name,revenue.billing_account_id\", \"revenue.product_group\" }}"
+      label: "Drill by Product Group"
+      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
+    }
+    # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
+    #html: @{custom_dollar_formatting} ;;
+  }
+
   measure: revenue_promo {
     group_label: "Discounts, Credits & BMODS"
     label: "Revenue (Promo)"
@@ -692,6 +956,7 @@
     # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
     # html: @{custom_dollar_formatting} ;;
   }
+
   measure: revenue_reseller {
     group_label: "Discounts, Credits & BMODS"
     label: "Revenue (Reseller)"
@@ -704,75 +969,7 @@
     # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
     # html: @{custom_dollar_formatting} ;;
   }
-  measure: revenue_rvp {
-    label: "Revenue (RVP)"
-    view_label: "Revenue"
-    description: "Revenue definition used by Region VPs.  See go/revenue-walk"
-    type: sum
-    sql: ${usd_revenue_rvp};;
-    value_format_name: usd_0
-    drill_fields: [billing_account_id, revenue_net_cn]
-    link: {
-      url: "{{ link | replace: \"billing_account_id\", \"product_line\" }}&limit=10"
-      label: "Top 10 Product Lines"
-      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
-    }
-    link: {
-      url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
-      {{ link | replace: column_name, \"=revenue.nal_name,revenue.reporting_account_name\" }}&limit=10&sorts={{ _field._name }}+desc
-      "
-      label: "Top 10 Accounts"
-      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
-    }
-    link: {
-      url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
-      {{ link | replace: column_name, \"=revenue.product_group,revenue.sku_id,revenue.sku_description\" }}&limit=10&sorts={{ _field._name }}+desc
-      "
-      label: "Top 10 SKUs"
-      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
-    }
-    link: {
-      url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
-      {{ link | replace: column_name, \"=revenue.segment\" }}&limit=10&sorts={{ _field._name }}+desc
-      "
-      label: "Drill by Segment"
-      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
-    }
-    link: {
-      url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
-      {{ link | replace: column_name, \"=revenue.account_category\" }}&limit=10&sorts={{ _field._name }}+desc
-      "
-      label: "Drill by Account Category"
-      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
-    }
-    link: {
-      url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
-      {{ link | replace: column_name, \"=revenue.region\" }}&limit=10&sorts={{ _field._name }}+desc
-      "
-      label: "Drill by Region"
-      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
-    }
-    link: {
-      url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
-      {{ link | replace: column_name, \"=revenue.region,revenue.sub_region,revenue.micro_region,revenue.nal_cluster,revenue.nal_name,revenue.nal_id\" }}&sorts={{ _field._name }}+desc
-      "
-      label: "Drill by NAL"
-      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
-    }
-    link: {
-      url: "{{ link | replace: \"billing_account_id\", \"product_group\" }}"
-      label: "Drill by Product Group"
-      icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
-    }
-    # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
-    # html: @{custom_dollar_formatting} ;;
-  }
+
   measure: revenue_sud {
     group_label: "Discounts, Credits & BMODS"
     label: "Revenue (Sustained Usage Discount)"
@@ -781,10 +978,11 @@
     type: sum
     sql: ${usd_revenue_sud};;
     value_format_name: usd_0
-    drill_fields: [billing_account_id, revenue_sud, revenue_gross, revenue_net_cn]
+    drill_fields: [reporting_account_name, billing_account_id, revenue_sud, revenue_gross, revenue_net_cn]
     # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
-    # html: @{custom_dollar_formatting} ;;
+   # html: @{custom_dollar_formatting} ;;
   }
+
   measure: revenue_toggle {
     group_label: "Other Revenue"
     label: "Revenue (Toggle-able)"
@@ -800,26 +998,25 @@
           {% elsif metric_selector._parameter_value == 'net_channel_neutral' %} ${usd_revenue_net_cn}
           {% elsif metric_selector._parameter_value == 'gross' %} ${usd_revenue_gross}
           {% elsif metric_selector._parameter_value == 'blended' %} ${usd_revenue_blended}
-          {% elsif metric_selector._parameter_value == 'rvp' %} ${usd_revenue_rvp}
           {% endif %} ;;
-    drill_fields: [billing_account_id, revenue_toggle]
+    drill_fields: [reporting_account_name, billing_account_id, revenue_toggle]
     value_format_name: usd_0
     link: {
-      url: "{{ link | replace: \"billing_account_id\", \"product_line\" }}&limit=10"
+      url: "{{ link | replace: \"revenue.reporting_account_name,revenue.billing_account_id\", \"revenue.product_line\" }}&limit=10"
       label: "Top 10 Product Lines"
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
     link: {
       url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
-      {{ link | replace: column_name, \"=revenue.nal_name,revenue.reporting_account_name\" }}&limit=10&sorts={{ _field._name }}+desc
+      {% assign column_name = \"\" | append: _view._name | append: \".billing_account_id\" %}
+      {{ link | replace: column_name, \"=\" }}&limit=10&sorts={{ _field._name }}+desc
       "
       label: "Top 10 Accounts"
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
     link: {
       url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
       {{ link | replace: column_name, \"=revenue.segment\" }}&limit=10&sorts={{ _field._name }}+desc
       "
       label: "Drill by Segment"
@@ -827,15 +1024,15 @@
     }
     link: {
       url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
-      {{ link | replace: column_name, \"=revenue.account_category\" }}&limit=10&sorts={{ _field._name }}+desc
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
+      {{ link | replace: column_name, \"=vector_customers.is_digital_native\" }}&limit=10&sorts={{ _field._name }}+desc
       "
       label: "Drill by Account Category"
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
     link: {
       url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
       {{ link | replace: column_name, \"=revenue.region\" }}&limit=10&sorts={{ _field._name }}+desc
       "
       label: "Drill by Region"
@@ -843,21 +1040,221 @@
     }
     link: {
       url: "
-      {% assign column_name = \"=\" | append: _view._name | append: \".billing_account_id\" %}
+      {% assign column_name = \"=\" | append: _view._name | append: \".reporting_account_name,\" | append: _view._name | append: \".billing_account_id\" %}
       {{ link | replace: column_name, \"=revenue.region,revenue.sub_region,revenue.micro_region,revenue.nal_cluster,revenue.nal_name,revenue.nal_id\" }}&sorts={{ _field._name }}+desc
       "
       label: "Drill by NAL"
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
     link: {
-      url: "{{ link | replace: \"billing_account_id\", \"product_group\" }}"
+      url: "{{ link | replace: \"revenue.reporting_account_name,revenue.billing_account_id\", \"revenue.product_group\" }}"
       label: "Drill by Product Group"
       icon_url: "https://g3doc.corp.google.com/company/teams/concord/portal/images/logo-concord-no-text.png"
     }
     # Reference: https://community.looker.com/lookml-5/conditional-formatting-using-value-format-926
-    # html: @{custom_dollar_formatting} ;;
+    #html: @{custom_dollar_formatting} ;;
   }
+
+  ## Metric Components
+
+  # Invoice Revenue
+
+  measure: invoice_revenue_components_gross {
+    label: "Gross Revenue (Invoice Component)"
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_invoice_revenue_components_gross, revenue_invoice]
+    #html: @{custom_dollar_formatting} ;;
+    description: "Gross Revenue component of Invoice Revenue calculation."
+    sql: ${usd_invoice_revenue_components_gross} ;;
+  }
+
+  measure: invoice_revenue_components_sud {
+    label: "SUDs (Invoice Component)"
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_invoice_revenue_components_sud, revenue_invoice]
+    #html: @{custom_dollar_formatting} ;;
+    description: "SUD component of Invoice Revenue calculation."
+    sql: ${usd_invoice_revenue_components_sud} ;;
+  }
+
+  measure: invoice_revenue_components_cud {
+    label: "CUDs (Invoice Component)"
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_invoice_revenue_components_cud, revenue_invoice]
+    #html: @{custom_dollar_formatting} ;;
+    description: "CUD component of Invoice Revenue calculation."
+    sql: ${usd_invoice_revenue_components_cud} ;;
+  }
+
+  measure: invoice_revenue_components_ft {
+    label: "Free Trial Credits (Invoice Component)"
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_invoice_revenue_components_ft, revenue_invoice]
+    #html: @{custom_dollar_formatting} ;;
+    description: "FT component of Invoice Revenue calculation."
+    sql: ${usd_invoice_revenue_components_ft} ;;
+  }
+
+  measure: invoice_revenue_components_promo {
+    label: "Promo Credits (Invoice Component)"
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_invoice_revenue_components_promo, revenue_invoice]
+    #html: @{custom_dollar_formatting} ;;
+    description: "Promo component of Invoice Revenue calculation."
+    sql: ${usd_invoice_revenue_components_promo} ;;
+  }
+
+  measure: invoice_revenue_components_reseller_credit {
+    label: "Reseller Margin (Invoice Component)"
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_invoice_revenue_components_reseller_credit, revenue_invoice]
+    #html: @{custom_dollar_formatting} ;;
+    description: "Reseller Credit component of Invoice Revenue calculation."
+    sql: ${usd_invoice_revenue_components_reseller_credit} ;;
+  }
+
+  measure: invoice_revenue_components_cross_pa_credits_addback {
+    label: "xPA Credit Addback (Invoice Component)"
+    view_label: "Revenue"
+    group_label: "Invoice Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_invoice_revenue_components_cross_pa_credits_addback, revenue_invoice]
+    #html: @{custom_dollar_formatting} ;;
+    description: "xPA component of Invoice Revenue calculation."
+    sql: ${usd_invoice_revenue_components_cross_pa_credits_addback} ;;
+  }
+
+# Sales Revenue
+
+  measure: sales_revenue_components_gross {
+    label: "Gross Revenue (Sales Component)"
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_sales_revenue_components_gross, revenue_sales]
+    #html: @{custom_dollar_formatting} ;;
+    description: "Gross Revenue component of Sales Revenue calculation."
+    sql: ${usd_sales_revenue_components_gross} ;;
+  }
+
+  measure: sales_revenue_components_sud {
+    label: "SUDs (Sales Component)"
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_sales_revenue_components_sud, revenue_sales]
+    #html: @{custom_dollar_formatting} ;;
+    description: "SUD component of Sales Revenue calculation."
+    sql: ${usd_sales_revenue_components_sud} ;;
+  }
+
+  measure: sales_revenue_components_cud {
+    label: "CUDs (Sales Component)"
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_sales_revenue_components_cud, revenue_sales]
+    #html: @{custom_dollar_formatting} ;;
+    description: "CUD component of Sales Revenue calculation."
+    sql: ${usd_sales_revenue_components_cud} ;;
+  }
+
+  measure: sales_revenue_components_ft {
+    label: "Free Trial Credits (Sales Component)"
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_sales_revenue_components_ft, revenue_sales]
+    #html: @{custom_dollar_formatting} ;;
+    description: "FT component of Sales Revenue calculation."
+    sql: ${usd_sales_revenue_components_ft} ;;
+  }
+
+  measure: sales_revenue_components_promo {
+    label: "Promo Credits (Sales Component)"
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_sales_revenue_components_promo, revenue_sales]
+    #html: @{custom_dollar_formatting} ;;
+    description: "Promo component of Sales Revenue calculation."
+    sql: ${usd_sales_revenue_components_promo} ;;
+  }
+
+  measure: sales_revenue_components_reseller_credit {
+    label: "Reseller Margin (Sales Component)"
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_sales_revenue_components_reseller_credit, revenue_sales]
+    #html: @{custom_dollar_formatting} ;;
+    description: "Reseller Credit component of Sales Revenue calculation."
+    sql: ${usd_sales_revenue_components_reseller_credit} ;;
+  }
+
+  measure: sales_revenue_components_cross_pa_credits_addback {
+    label: "xPA Credit Addback (Sales Component)"
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_sales_revenue_components_cross_pa_credits_addback, revenue_sales]
+    #html: @{custom_dollar_formatting} ;;
+    description: "xPA component of Sales Revenue calculation."
+    sql: ${usd_sales_revenue_components_cross_pa_credits_addback} ;;
+  }
+
+  measure: sales_revenue_components_partner_margin_addback {
+    label: "Partner Margin Addback (Sales Component)"
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_sales_revenue_components_partner_margin_addback, revenue_sales]
+    #html: @{custom_dollar_formatting} ;;
+    description: "Partner Margin addback component of Sales Revenue calculation."
+    sql: ${usd_sales_revenue_components_partner_margin_addback} ;;
+  }
+
+  measure: sales_revenue_components_isv_deduction {
+    label: "ISV Deduction (Sales Component)"
+    view_label: "Revenue"
+    group_label: "Sales Revenue Components"
+    type: sum
+    value_format_name: usd_0
+    drill_fields: [reporting_account_name, billing_account_id, usd_sales_revenue_components_isv_deduction, revenue_sales]
+    #html: @{custom_dollar_formatting} ;;
+    description: "Marketplace ISV deduction in Sales Revenue calculation."
+    sql: ${usd_sales_revenue_components_isv_deduction} ;;
+  }
+
   #### PARAMETERS ####
+
   parameter: metric_selector {
     view_label: "Revenue"
     description: "This parameter is for dashboard building only.  This allows users to select a metric type
@@ -871,10 +1268,6 @@
       value: "blended"
     }
     allowed_value: {
-      label: "Revenue (RVP)"
-      value: "rvp"
-    }
-    allowed_value: {
       label: "Revenue (2021 Def.)"
       value: "net_channel_neutral"
     }
@@ -891,6 +1284,7 @@
       value: "ntg"
     }
   }
+
   parameter: filter_nonmetered {
     view_label: "Revenue"
     label: "Remove Prepaid Purchases?"
@@ -906,6 +1300,7 @@
       value: "false"
     }
   }
+
   parameter: usage_timeframe_selector {
     view_label: "Revenue"
     description: "Updates the `Dynamic Usage Timeframe` field based on selection of granularity."
@@ -921,4 +1316,5 @@
       value: "Month"
     }
   }
+
 }