diff --git a/src/modules/feature/FeatureSteps.vue b/src/modules/feature/FeatureSteps.vue
index b665be3..5f8ac9d 100644
--- a/src/modules/feature/FeatureSteps.vue
+++ b/src/modules/feature/FeatureSteps.vue
@@ -4,22 +4,25 @@ import { featureSteps } from '@/modules/feature/feature-steps'
 import { useFeatureStore } from '@/modules/feature/feature-store'
 import { onMounted } from 'vue'
 
+const NUMBER_OF_FEATURES = 20
+
 const featureStore = useFeatureStore()
 
-onMounted(() => featureStore.initBoard())
+onMounted(() => featureStore.initBoard(NUMBER_OF_FEATURES))
 </script>
 
 <template>
   <div class="dashboard">
     <div>
-      {{ featureStore.features.length }} features | mean complexity :
-      {{ featureStore.meanComplexity }} | mean lead time :
-      {{ featureStore.meanLeadTime }} days | Total days:
+      {{ featureStore.features.length }} / {{ NUMBER_OF_FEATURES }} features in
+      the board | mean complexity : {{ featureStore.meanComplexity }} | mean
+      lead time : {{ featureStore.meanLeadTime }} days | Total days:
       {{ featureStore.meta.totalDays }} | Team work experience:
       {{ featureStore.meta.teamWorkExperience }}
     </div>
     <div class="row">
-      New feature live every {{ featureStore.taktTime }} days.
+      New feature live every {{ featureStore.taktTime }} days. Finishing in
+      {{ featureStore.eat }} days.
     </div>
     <div class="row">Strategy of the day:</div>
     <div class="row">
diff --git a/src/modules/feature/feature-board.ts b/src/modules/feature/feature-board.ts
index ddcdccb..b188805 100644
--- a/src/modules/feature/feature-board.ts
+++ b/src/modules/feature/feature-board.ts
@@ -11,7 +11,6 @@ import {
   sumElements
 } from '@/utils'
 
-const MAX_FEATURES = 200
 const HARD_STOP = 5000
 
 const hasQualityIssue = ({
@@ -34,7 +33,10 @@ const hasQualityIssue = ({
   return quality > qualityProbability / multiplicator
 }
 
-export const newBacklog = () => shuffleArray(initialFeatures)
+export const newBacklog = (limit?: number) =>
+  limit !== undefined
+    ? popNElement(shuffleArray(initialFeatures), limit)
+    : shuffleArray(initialFeatures)
 
 export const initBoard = (
   steps: FeatureStep[],
@@ -125,7 +127,7 @@ export const getFeaturesForNextDay = ({
       }
     })
 
-  if (features.length < MAX_FEATURES) {
+  if (backlog.length > 0) {
     switch (strategy) {
       case 'push': {
         const [nextFeature] = popNElement(backlog, 1)
@@ -217,7 +219,7 @@ const getQualityProbability = (
   return probabilityOfGoodQuality
 }
 
-const isFeatureDone = (feature: Feature) =>
+export const isFeatureDone = (feature: Feature) =>
   feature.step === 0 && feature.status === 'done'
 
 export const nextDay = (
@@ -276,7 +278,7 @@ export const simulate = (
   let i = 0
 
   while (!isProjectFinished(state.features) && i++ < HARD_STOP) {
-    if (strategy === 'pull-dps' || strategy === 'push-dps') {
+    if (strategy.includes('dps')) {
       if (state.meta.totalDays % 5 === 0) {
         state = nextDay(state, 'problem-solving')
       } else {
diff --git a/src/modules/feature/feature-store.ts b/src/modules/feature/feature-store.ts
index 873310c..53a3e51 100644
--- a/src/modules/feature/feature-store.ts
+++ b/src/modules/feature/feature-store.ts
@@ -4,13 +4,13 @@ import {
   getMeanLeadTime,
   getMeanQualityIssue,
   initBoard,
+  isFeatureDone,
   newBacklog,
   nextDay
 } from '@/modules/feature/feature-board'
 import { featureSteps } from '@/modules/feature/feature-steps'
 import { Strategy } from '@/modules/lean/strategy'
 import { FeatureState, Meta } from '@/store-type'
-import { sumElements } from '@/utils'
 import { defineStore } from 'pinia'
 
 const resetMeta = (): Meta => ({
@@ -33,9 +33,9 @@ export const useFeatureStore = defineStore('feature', {
     meta: resetMeta()
   }),
   actions: {
-    // set the number of feature we want
-    async initBoard() {
-      this.backlog = newBacklog()
+    // todo set the number of feature we want
+    async initBoard(limit: number) {
+      this.backlog = newBacklog(limit)
       this.steps = featureSteps
       this.features = initBoard(this.steps, this.backlog)
 
@@ -56,10 +56,10 @@ export const useFeatureStore = defineStore('feature', {
     meanComplexity: (state) => getMeanComplexity(state.features),
     meanLeadTime: (state) => getMeanLeadTime(state.features),
     meanQualityIssue: (state) => getMeanQualityIssue(state.features),
-    taktTime: (state) =>
+    taktTime: (state): string =>
       (
-        state.meta.totalDays / sumElements(state.meta.featuresDonePerDay)
-      ).toFixed(2) ?? 0,
+        state.meta.totalDays / state.features.filter(isFeatureDone).length
+      ).toFixed(2) ?? `0`,
     featuresGroupedByStep: (state) => {
       const groupedByStep: Record<number, Feature[]> = {}
 
@@ -72,6 +72,13 @@ export const useFeatureStore = defineStore('feature', {
       })
 
       return groupedByStep
+    },
+    eat(): string {
+      return (
+        parseFloat(this.taktTime) *
+        (this.features.filter((feature) => !isFeatureDone(feature)).length +
+          this.backlog.length)
+      ).toFixed(2)
     }
   }
 })
diff --git a/src/modules/simulation/SimulationDashboard.vue b/src/modules/simulation/SimulationDashboard.vue
index c1080c0..3605588 100644
--- a/src/modules/simulation/SimulationDashboard.vue
+++ b/src/modules/simulation/SimulationDashboard.vue
@@ -21,8 +21,8 @@ const strategies: Strategy[] = ['push', 'pull', 'push-dps', 'pull-dps']
           <th>#</th>
           <th class="numeric">push</th>
           <th class="numeric">pull</th>
-          <th class="numeric">pull and DPS</th>
           <th class="numeric">push and DPS</th>
+          <th class="numeric">pull and DPS</th>
         </tr>
       </thead>
       <tbody>
diff --git a/src/modules/simulation/simulation-store.ts b/src/modules/simulation/simulation-store.ts
index 261eb6d..875d723 100644
--- a/src/modules/simulation/simulation-store.ts
+++ b/src/modules/simulation/simulation-store.ts
@@ -1,7 +1,7 @@
 import { featureSteps } from '@/modules/feature/feature-steps'
 import { Strategy } from '@/modules/lean/strategy'
 import { Dashboard, Meta } from '@/store-type'
-import { getRound, sumElements } from '@/utils'
+import { getRound } from '@/utils'
 import { defineStore } from 'pinia'
 
 // Get features done per day to plot it
@@ -64,6 +64,7 @@ export const useSimulationStore = defineStore('dashboard', {
       this.dashboards.push(dashboard)
     },
     async simulate(strategy: Strategy) {
+      this.requestedSimulation++
       const steps = featureSteps
       const backlog = await instance.newBacklog()
       const features = await instance.initBoard(steps, backlog)
@@ -98,10 +99,8 @@ export const useSimulationStore = defineStore('dashboard', {
 
       this.newDashboard(dashboard)
       this.mean[strategy].leadTimeSum += dashboard.analysis.meanLeadTime
-      // todo: set directly the number of features
       this.mean[strategy].taktTimeSum +=
-        dashboard.meta.totalDays /
-        sumElements(dashboard.meta.featuresDonePerDay)
+        dashboard.meta.totalDays / newState.features.length
       this.mean[strategy].complexitySum += dashboard.analysis.meanComplexity
       this.mean[strategy].qualityIssueSum += dashboard.analysis.meanQualityIssue
       this.mean[strategy].simulations++