diff --git a/15-multi-step-form/src/main/resources/templates/step1.html b/15-multi-step-form/src/main/resources/templates/step1.html
index 2fd9d06..fb2515d 100644
--- a/15-multi-step-form/src/main/resources/templates/step1.html
+++ b/15-multi-step-form/src/main/resources/templates/step1.html
@@ -38,7 +38,7 @@
     <form
       class="flex flex-col items-center w-screen h-screen md:grid md:items-start md:p-5 md:bg-white md:rounded-2xl md:grid-cols-[auto_1fr] md:w-desktop-form md:h-desktop-form md:drop-shadow-2xl"
       id="form-step"
-      th:fragment="formFragment(formData)"
+      th:fragment="formFragment(formData.userAnswers)"
       hx-post="/submit-step/1/2"
       hx-swap="outerHTML"
       action="/submit-step/1/2"
@@ -105,7 +105,7 @@
         <label for="name" class="pt-3 text-sm md:pt-5 md:pb-2 text-marine-blue">Name</label>
         <input
           id="name"
-          th:value="${formData.step1.name}"
+          th:value="${formData.userAnswers.step1.name}"
           name="name"
           type="text"
           placeholder="e.g. Stephen King"
@@ -116,7 +116,7 @@
         >
         <input
           id="email"
-          th:value="${formData.step1.email}"
+          th:value="${formData.userAnswers.step1.email}"
           name="email"
           type="email"
           placeholder="e.g. stephenking@lorem.com"
@@ -127,7 +127,7 @@
         >
         <input
           id="phone"
-          th:value="${formData.step1.phone}"
+          th:value="${formData.userAnswers.step1.phone}"
           name="phone"
           type="tel"
           placeholder="e.g. +1 234 567 890"
diff --git a/15-multi-step-form/src/main/resources/templates/step2.html b/15-multi-step-form/src/main/resources/templates/step2.html
index 5b36db7..5b4ef1c 100644
--- a/15-multi-step-form/src/main/resources/templates/step2.html
+++ b/15-multi-step-form/src/main/resources/templates/step2.html
@@ -43,7 +43,7 @@
         hx-swap="outerHTML"
         action="/submit-step/2/3"
         method="post"
-        th:fragment="formFragment(formData)"
+        th:fragment="formFragment(formData.userAnswers)"
       >
         <summary
           class="w-full h-44 bg-no-repeat md:row-span-2 bg-sidebar-mobile marker:text-white md:bg-sidebar-desktop md:h-[568px] md:w-[274px]"
@@ -119,7 +119,7 @@
                 name="plan-type"
                 value="Arcade"
                 class="hidden peer"
-                th:checked="${formData.step2.planType.toString()} == 'Arcade'"
+                th:checked="${formData.userAnswers.step2.planType.toString()} == 'Arcade'"
                 checked
               />
               <div
@@ -136,7 +136,7 @@
                 name="plan-type"
                 value="Advanced"
                 class="hidden peer"
-                th:checked="${formData.step2.planType.toString()} == 'Advanced'"
+                th:checked="${formData.userAnswers.step2.planType.toString()} == 'Advanced'"
               />
               <div
                 class="absolute inset-y-0 inset-x-0 rounded-lg border border-cool-gray peer-checked:border-purplish-blue peer-checked:bg-magnolia"
@@ -152,7 +152,7 @@
                 name="plan-type"
                 value="Pro"
                 class="hidden peer"
-                th:checked="${formData.step2.planType.toString()} == 'Pro'"
+                th:checked="${formData.userAnswers.step2.planType.toString()} == 'Pro'"
               />
               <div
                 class="absolute inset-y-0 inset-x-0 rounded-lg border border-cool-gray peer-checked:border-purplish-blue peer-checked:bg-magnolia"
@@ -172,7 +172,7 @@
                 name="isPackageYearly"
                 role="switch"
                 id="packageDuration"
-                th:checked="${formData.step2.isYearly}"
+                th:checked="${formData.userAnswers.step2.isYearly}"
               />
               <span class="row-start-1 text-marine-blue peer-checked:text-cool-gray">Monthly</span>
               <span class="row-start-1 text-cool-gray peer-checked:text-marine-blue">Yearly</span>
diff --git a/15-multi-step-form/src/main/resources/templates/step3.html b/15-multi-step-form/src/main/resources/templates/step3.html
index 12d3441..05b1fc1 100644
--- a/15-multi-step-form/src/main/resources/templates/step3.html
+++ b/15-multi-step-form/src/main/resources/templates/step3.html
@@ -43,7 +43,7 @@
         hx-swap="outerHTML"
         action="/submit-step/3/4"
         method="post"
-        th:fragment="formFragment(formData)"
+        th:fragment="formFragment(formData.userAnswers)"
       >
         <summary
           class="w-full h-44 bg-no-repeat md:row-span-2 bg-sidebar-mobile marker:text-white md:bg-sidebar-desktop md:h-[568px] md:w-[274px]"
@@ -117,7 +117,7 @@
                 value="OnlineService"
                 name="addon-services"
                 class="my-7 w-6 h-6 peer"
-                th:checked="${formData.step3.containsAddon('OnlineService')}"
+                th:checked="${formData.userAnswers.step3.containsAddon('OnlineService')}"
               />
               <div
                 class="absolute inset-y-0 inset-x-0 rounded-lg border border-cool-gray peer-checked:border-purplish-blue peer-checked:bg-magnolia/50"
@@ -141,7 +141,7 @@
                 name="addon-services"
                 value="LargerStorage"
                 class="my-7 w-6 h-6 peer"
-                th:checked="${formData.step3.containsAddon('LargerStorage')}"
+                th:checked="${formData.userAnswers.step3.containsAddon('LargerStorage')}"
               />
               <div
                 class="absolute inset-y-0 inset-x-0 rounded-lg border border-cool-gray peer-checked:border-purplish-blue peer-checked:bg-magnolia/50"
@@ -165,7 +165,7 @@
                 name="addon-services"
                 value="CustomProfile"
                 class="my-7 w-6 h-6 peer"
-                th:checked="${formData.step3.containsAddon('CustomProfile')}"
+                th:checked="${formData.userAnswers.step3.containsAddon('CustomProfile')}"
               />
               <div
                 class="absolute inset-y-0 inset-x-0 rounded-lg border border-cool-gray peer-checked:border-purplish-blue peer-checked:bg-magnolia/50"
diff --git a/15-multi-step-form/src/main/scala/multistepform/Models.scala b/15-multi-step-form/src/main/scala/multistepform/Models.scala
index 9afbab9..168be96 100644
--- a/15-multi-step-form/src/main/scala/multistepform/Models.scala
+++ b/15-multi-step-form/src/main/scala/multistepform/Models.scala
@@ -12,6 +12,53 @@ object Models {
     step4 = StepAnswers.Step4(true)
   )
 
+  /** Labels and form info which dynamically depend on user answers e.g plan
+    * name 'Arcade (Yearly)' vs 'Pro (Monthly)'
+    */
+  final case class FormData(
+      userAnswers: Answers
+  ) {
+    def planDiscountMessage: Option[String] =
+      if (userAnswers.step2.isYearly) Some("2 monts free") else None
+
+    // yeah, in real world it will not be this simple
+    def yearlyCost(monthlyCost: Int): Int = 10 * monthlyCost
+
+    def periodCostLabel: String = {
+      if (userAnswers.step2.isYearly) "yr" else "mo"
+    }
+
+    def planCost: Int = {
+      val monthlyPlanCost = userAnswers.step2.planType match {
+        case PlanType.Arcade   => 9
+        case PlanType.Advanced => 12
+        case PlanType.Pro      => 15
+      }
+      if (userAnswers.step2.isYearly) yearlyCost(monthlyPlanCost)
+      else monthlyPlanCost
+    }
+
+    def addonMontlyCost: Addons => Int = {
+      case Addons.OnlineService => 1
+      case Addons.LargerStorage => 2
+      case Addons.CustomProfile => 2
+    }
+
+    def addonCost(addon: Addons): Int = {
+      val monthCost = addonMontlyCost(addon)
+      if (userAnswers.step2.isYearly) yearlyCost(monthCost) else monthCost
+    }
+
+    def fullPlanName: String = {
+      val period = if (userAnswers.step2.isYearly) "Yearly" else "Monthly"
+      s"${userAnswers.step2.planType} (${period})"
+    }
+
+    def fullOrderPrice: Int = {
+      planCost + userAnswers.step3.addons.map(addonCost).sum
+    }
+  }
+
   final case class Answers(
       sessionId: String = "id1",
       currentStep: Int = 1,
diff --git a/15-multi-step-form/src/main/scala/multistepform/Routes.scala b/15-multi-step-form/src/main/scala/multistepform/Routes.scala
index 595fdb9..42364d2 100644
--- a/15-multi-step-form/src/main/scala/multistepform/Routes.scala
+++ b/15-multi-step-form/src/main/scala/multistepform/Routes.scala
@@ -75,7 +75,8 @@ case class Routes()(implicit cc: castor.Context, log: cask.Logger)
     val state = Sessions.sessionReplies.getOrElse(id, Answers(id))
     println(s"starting form for $state")
     val context = new Context()
-    context.setVariable(formDataContextVarName, state)
+    val formData = Models.FormData(state)
+    context.setVariable(formDataContextVarName, formData)
     val formFragment = templateEngine.process(
       state.fragmentName,
       Set("formFragment").asJava,
@@ -106,7 +107,8 @@ case class Routes()(implicit cc: castor.Context, log: cask.Logger)
     Sessions.sessionReplies.update(id, updatedAnswers)
 
     val context = new Context()
-    context.setVariable(formDataContextVarName, updatedAnswers)
+    val formData = Models.FormData(updatedAnswers)
+    context.setVariable(formDataContextVarName, formData)
     val nextFormFragment = templateEngine.process(
       updatedAnswers.fragmentName,
       Set("formFragment").asJava,