diff --git a/app/Http/Controllers/QuizController.php b/app/Http/Controllers/QuizController.php
index 59763962..9e6be790 100755
--- a/app/Http/Controllers/QuizController.php
+++ b/app/Http/Controllers/QuizController.php
@@ -14,105 +14,86 @@ class QuizController extends Controller
      */
     public QuizState $quiz;
 
-    public Question $currentQuestion;
+    /**
+     * Display the welcome page.
+     *
+     * @throws \Exception
+     */
+    public function index()
+    {
+        return view('quiz.index');
+    }
 
     /**
-     * @param \Illuminate\Http\Request $request
+     * Set collection of questions and start the quiz.
+     *
+     * @throws \Exception
+     *
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
      */
-    public function startQuiz(Request $request)
+    public function start()
     {
-        $this->quiz = new QuizState();
-        $this->quiz->countQuestions = $this->questions()->count();
-        $this->quiz->start = true;
-        $this->quiz->lastQuestion--;
+        $this->quiz = new QuizState($this->questions());
 
-        return $this->next($request);
+        return $this->show();
     }
 
+    /**
+     * Move to the next question.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @throws \Exception
+     *
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     */
     public function next(Request $request)
     {
         $this->quiz ??= unserialize($request->session()->get('quiz'));
 
-        $this->quiz->isIncorrect = false;
-        $this->quiz->currentAnswers = [];
-        $this->quiz->displayInfo = false;
-        $this->quiz->userAnswer = '';
-        $this->quiz->lastQuestion++;
-        $this->quiz->stepProgressBar = $this->quiz->lastQuestion;
-
-        if (! $this->questions()->has($this->quiz->lastQuestion)) {
-            $this->quiz->finish = true;
-            $this->currentQuestion = Question::recovery($this->quiz->currentQuestion);
-
-            return turbo_stream_view($this->show($request));
-        }
+        $this->quiz->next();
 
-        $this->currentQuestion = $this->questions()->get($this->quiz->lastQuestion);
-        $this->quiz->currentQuestion = $this->currentQuestion->toArray();
-
-        return turbo_stream_view($this->show($request));
+        return $this->show();
     }
 
     /**
+     * Process user's answer.
+     *
      * @param Request $request
      *
      * @throws \Exception
      *
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|void
      */
-    public function setAnswer(Request $request)
+    public function answer(Request $request)
     {
         $userAnswer = $request->get('answer');
         $this->quiz = unserialize($request->session()->get('quiz'));
 
-        $this->quiz->countAttempts++;
-        $this->quiz->userAnswer = $userAnswer;
-        $this->currentQuestion = Question::recovery($this->quiz->currentQuestion);
+        $this->quiz->applyAnswer($userAnswer);
 
-        if (! $this->currentQuestion->isCorrect($userAnswer)) {
-            $this->quiz->countIncorrect++;
-            $this->quiz->currentAnswers[] = $userAnswer;
-            $this->quiz->live--;
-            $this->quiz->isIncorrect = true;
-
-            if ($this->quiz->live < 1) {
-                $this->quiz->gameOver = true;
-            }
-
-            return turbo_stream_view($this->show($request));
-        }
-        $this->quiz->isIncorrect = false;
-        $this->quiz->displayInfo = true;
-        $this->quiz->countCorrects++;
-        $this->quiz->stepProgressBar++;
-
-        return turbo_stream_view($this->show($request));
+        return $this->show();
     }
 
     /**
+     * Display the quiz page.
+     *
      * @throws \Exception
      */
-    public function show(Request $request)
+    protected function show()
     {
-        $request->session()->put('quiz', serialize($this->quiz));
+        session()->put('quiz', serialize($this->quiz));
 
-        return view('quiz.quiz', [
+        return turbo_stream_view(view('quiz.quiz', [
             'quiz'               => $this->quiz,
-            'currentQuestion'    => $this->currentQuestion ?? $this->questions()->get($this->quiz->lastQuestion),
-            'currentStepPercent' => $this->currentStepPercent($this->quiz->stepProgressBar),
-        ]);
+            'currentQuestion'    => $this->quiz->question(),
+        ]));
     }
 
     /**
-     * @throws \Exception
-     */
-    public function index(Request $request)
-    {
-        return view('quiz.index');
-    }
-
-    /**
-     * Для каждой эмоции у нас есть две ситуации, cчайным образом выбираем одну
+     * Generate questions for the quiz.
+     *
+     * Randomly choose one situation for each emotion.
      *
      * @throws \Exception
      *
@@ -121,9 +102,16 @@ public function index(Request $request)
     public function questions(): Collection
     {
         return collect([
-            Question::make(['Какова основная цель фреймворка Laravel?', 'Какой фреймворк акцентирует внимание на элегантном синтаксисе и призван делать процесс разработки приятным?'])
-                ->answers(['Symfony', 'Django', 'Rails', 'Express', 'Laravel'])
-                ->setCorrectAnswer('Laravel'),
+            Question::make(['### MVC Overview
+
+- **Model**: Represents the data and the business rules concerning the data. This includes data persistence, validation, business logic, and authentication.
+
+- **View**: Presents data to the user in a specific format. The view receives data from the model and user interactions from the controller.
+
+- **Controller**: Acts as an intermediary between models and views. It processes user input, interacts with the model, and selects the view to display.
+'])
+                ->answers(['**Controller**: Acts as an intermediary between models and views. It processes user input, interacts with the model, and selects the view to display.', 'Django', 'Rails', 'Express', 'Laravel'])
+                ->setCorrectAnswer('**Controller**: Acts as an intermediary between models and views. It processes user input, interacts with the model, and selects the view to display.'),
 
             Question::make(['Какой компонент Laravel позволяет управлять операциями с базой данных упрощенным способом?', 'Какая функция в Laravel упрощает взаимодействие с базой данных?'])
                 ->answers(['Eloquent ORM', 'Lumen', 'Blade', 'Artisan', 'Eloquent'])
@@ -142,15 +130,4 @@ public function questions(): Collection
                 ->setCorrectAnswer('Middleware'),
         ]);
     }
-
-    public function currentStepPercent($stepProgressBar)
-    {
-        $currentStep = $stepProgressBar;
-
-        if ($currentStep === 0) {
-            return 0;
-        }
-
-        return $currentStep / $this->questions()->count() * 100;
-    }
 }
diff --git a/app/Quiz/Question.php b/app/Quiz/Question.php
index 84edbd10..12e5c2e3 100755
--- a/app/Quiz/Question.php
+++ b/app/Quiz/Question.php
@@ -4,6 +4,8 @@
 
 namespace App\Quiz;
 
+use Illuminate\Support\Str;
+
 class Question
 {
     /**
@@ -97,7 +99,7 @@ public function isCorrect(string $ansver): bool
 
     public function getTitle()
     {
-        return $this->title;
+        return Str::of($this->title)->markdown();
     }
 
     public function getAnswers()
diff --git a/app/Quiz/QuizState.php b/app/Quiz/QuizState.php
index eec169cd..af87c527 100755
--- a/app/Quiz/QuizState.php
+++ b/app/Quiz/QuizState.php
@@ -2,25 +2,54 @@
 
 namespace App\Quiz;
 
+use Illuminate\Support\Collection;
+
 class QuizState implements \JsonSerializable
 {
-    public string $title = '';
+    /**
+     * Number of lives/attempts.
+     */
+    public const LIVE = 3;
+
+    /**
+     * Current step of the quiz.
+     *
+     * @var int
+     */
+    public int $step = 0;
+
+    /**
+     * User's answer to the previous question.
+     *
+     * @var string
+     */
     public string $userAnswer = '';
-    public int $lastQuestion = 0;
-    public int $stepProgressBar = 0;
-    public array $currentQuestion = [];
-    public array $currentAnswers = [];
-    public bool $start = false;
-    public int $countAttempts = 0;
-    public int $countCorrects = 0;
-    public int $countIncorrect = 0;
-    public int $countQuestions = 0;
-    public int $live = 3;
-    public bool $finish = false;
+
+    /**
+     * Current incorrect answers given by the user for the current question
+     * (to avoid re-answering the same question).
+     *
+     * @var array
+     */
+    public array $incorrectAnswers = [];
+
+    /**
+     * Number of lives/attempts.
+     *
+     * @var int
+     */
+    public int $live = self::LIVE;
+
     public bool $displayInfo = false;
-    public bool $gameOver = false;
     public bool $isIncorrect = false;
 
+    /**
+     * Collection of questions for the quiz.
+     *
+     * @var \Illuminate\Support\Collection|null
+     */
+    public ?Collection $questions;
+
     /**
      * Convert the object into a JSON serializable array.
      *
@@ -32,9 +61,10 @@ public function jsonSerialize(): array
     }
 
     /**
-     * Create a new QuizState object from JSON string.
+     * Create a new QuizState object from a JSON string.
      *
      * @param string $json The JSON string to deserialize.
+     *
      * @return QuizState The deserialized QuizState object.
      */
     public static function fromJson(string $json): QuizState
@@ -53,4 +83,110 @@ public static function fromJson(string $json): QuizState
         return $quizState;
     }
 
+    /**
+     * Move to the next question.
+     *
+     * @return $this
+     */
+    public function next(): static
+    {
+        $this->isIncorrect = false;
+        $this->incorrectAnswers = [];
+        $this->displayInfo = false;
+        $this->userAnswer = '';
+        $this->step++;
+
+        return $this;
+    }
+
+    /**
+     * Get the current question.
+     *
+     * @return \App\Quiz\Question|null
+     */
+    public function question(): ?Question
+    {
+        return $this->questions->get($this->step);
+    }
+
+    /**
+     * Initialize the QuizState object with questions.
+     *
+     * @param \Illuminate\Support\Collection|null $questions
+     */
+    public function __construct(?Collection $questions = null)
+    {
+        $this->questions = $questions;
+    }
+
+    /**
+     * Calculate the current step's percentage.
+     *
+     * @return float|int
+     */
+    public function currentStepPercent(): float|int
+    {
+        $currentStep = $this->step + 1;
+
+        if ($currentStep === 0) {
+            return 0;
+        }
+
+        return $currentStep / $this->questions->count() * 100;
+    }
+
+    /**
+     * Check if all questions have been asked.
+     *
+     * @return bool
+     */
+    public function isFinish(): bool
+    {
+        return !$this->questions->has($this->step);
+    }
+
+    /**
+     * Apply user's answer.
+     *
+     * @param mixed $answer The user's answer to the current question.
+     *
+     * @return $this
+     */
+    public function applyAnswer($answer): static
+    {
+        $this->userAnswer = $answer;
+
+        if (!$this->question()->isCorrect($answer)) {
+            $this->incorrectAnswers[] = $answer;
+            $this->live--;
+            $this->isIncorrect = true;
+        } else {
+            $this->isIncorrect = false;
+            $this->displayInfo = true;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Check if the user has run out of lives/attempts.
+     *
+     * @return bool
+     */
+    public function isDead(): bool
+    {
+        return $this->live < 1;
+    }
+
+    /**
+     * Check if the given answer is in the list of incorrect answers.
+     *
+     * @param string $answer The answer to check.
+     * @return bool True if the answer is incorrect, false otherwise.
+     */
+    public function hasIncorrectAnswer(string $answer): bool
+    {
+        return in_array($answer, $this->incorrectAnswers, true);
+    }
+
 }
diff --git a/resources/views/quiz/index.blade.php b/resources/views/quiz/index.blade.php
index cbdf9eeb..ef639435 100644
--- a/resources/views/quiz/index.blade.php
+++ b/resources/views/quiz/index.blade.php
@@ -37,68 +37,6 @@ class="btn btn-primary m-auto d-flex align-items-center justify-content-center w
                     Вернуться на главную
                 </a>
             </div>
-
-            <div class="modal modal-sheet fade" id="resetQuiz" data-bs-backdrop="static" tabindex="-1"
-                 aria-labelledby="resetQuiz"
-                 aria-hidden="true"
-            >
-                <div class="modal-dialog modal-dialog-scrollable modal-dialog-centered">
-                    <div class="modal-content">
-                        <div class="modal-header align-items-baseline pb-0">
-                            <h5 class="modal-title">{{ __('quiz.reset.title') }}</h5>
-                        </div>
-                        <div class="modal-body">
-                            <p class="mb-0">
-                                {{__('quiz.reset.description')}}
-                            </p>
-                        </div>
-                        <div class="modal-footer flex-column flex-md-row align-items-stretch w-100 gap-2 pb-3">
-                            <a href="{{route('quiz')}}"
-                               class="btn btn-primary">{{ __('quiz.reset.yes') }}</a>
-                            <button type="button" class="btn btn-link"
-                                    data-bs-dismiss="modal"
-                                    data-bs-target="#closeQuiz"
-                                    data-bs-toggle="modal"
-                            >{{ __('quiz.reset.no') }}</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="modal modal-sheet fade" id="closeQuiz" data-bs-backdrop="static" tabindex="-1"
-                 aria-labelledby="closeQuiz"
-                 aria-hidden="true"
-            >
-                <div class="modal-dialog modal-dialog-scrollable modal-dialog-centered">
-                    <div class="modal-content">
-                        <div class="modal-header align-items-baseline pb-0">
-                            <h5 class="modal-title">{{ __('quiz.close.title') }}</h5>
-                            <button type="button" class="btn-close flex-shrink-0" data-bs-dismiss="modal"
-                                    aria-label="Close"></button>
-                        </div>
-                        <div class="modal-body">
-                            <p class="mb-0">
-                                {!!__('quiz.close.description')!!}
-                            </p>
-                        </div>
-                        <div class="modal-footer flex-column flex-md-row align-items-stretch w-100 gap-2 pb-3">
-
-                            <a href="{{route('quiz')}}"
-                               data-turbo-action="replace"
-                               class="btn btn-primary d-flex align-items-center"
-                               data-bs-target="#resetQuiz"
-                               data-bs-toggle="modal"
-                            >
-                                <x-icon path="et.reset" class="ms-auto me-2"/>
-                                <span class="me-auto">{{__('quiz.reset.button')}}</span>
-
-                            </a>
-                            <button type="button" class="btn btn-secondary"
-                                    data-bs-dismiss="modal">{{ __('quiz.close.no') }}</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
         </div>
     </div>
 
diff --git a/resources/views/quiz/quiz.blade.php b/resources/views/quiz/quiz.blade.php
index a4cb2b5e..37041738 100644
--- a/resources/views/quiz/quiz.blade.php
+++ b/resources/views/quiz/quiz.blade.php
@@ -1,4 +1,4 @@
-@if ($quiz->finish)
+@if ($quiz->isFinish())
     <turbo-stream target="quiz" action="update">
         <template>
             <div class="d-flex p-0">
@@ -21,47 +21,52 @@ class="btn btn-primary m-auto d-flex align-items-center justify-content-center w
         </template>
     </turbo-stream>
 
-@elseif($quiz->gameOver)
+@elseif($quiz->isDead())
     <turbo-stream target="quiz" action="update">
         <template>
             <div class="d-flex p-0">
                 <img src="{{ asset('/img/ui/items.svg') }}" class="w-100 img-fluid">
             </div>
             <div class="card-body px-sm-4 pt-0">
-                <div class="d-flex align-items-center mb-2">
+                <div class="my-3">
                     <h1 class="">
-                        Игра окончена. Ты проиграл.
+                        Провал.
                     </h1>
+
+                    <p>
+                        Пожалуйста, примите это сообщение как возможность для улучшения. Мы рекомендуем вам ознакомиться
+                        с материалами на нашем сайте, чтобы подготовиться к повторному тестированию.
+                    </p>
                 </div>
                 <a href="{{route('stream.quiz.start')}}"
                    data-turbo-method="post"
                    class="btn btn-primary d-flex align-items-center">
                     <x-icon path="et.reset" class="ms-auto me-2"/>
-                    <span class="me-auto">Попробывать снова</span>
+                    <span class="me-auto">Попробовать снова</span>
                 </a>
             </div>
         </template>
     </turbo-stream>
 @else
-
     <turbo-stream target="quiz" action="update">
         <template>
             <div class="card-body px-sm-4 pt-sm-3">
                 <div>
                     @if(!$quiz->displayInfo)
                         <div class="d-flex align-items-baseline">
-                            <h5 class="mb-3 me-2">
-                                {{ __($currentQuestion->getTitle()) }}
-                            </h5>
+                            <div class="mb-3 me-2 d-flex flex-column">
+                                <h5>
+                                    {!! $currentQuestion->getTitle() !!}
+                                </h5>
+                            </div>
 
-                            <button type="button"
-                                    class="ms-auto btn btn-close px-2"
-                                    data-bs-target="#closeQuiz"
-                                    data-bs-toggle="modal">
-                            </button>
+                            <a href="{{route('quiz')}}"
+                               data-turbo-action="replace"
+                               title="Попробовать снова"
+                               class="ms-auto btn btn-close px-2">
+                            </a>
                         </div>
-                        <div class="{{ $quiz->displayInfo ? 'visually-hidden' : ''}}">
-
+                        <div>
                             @if($quiz->isIncorrect)
                                 <p class="text-center text-muted">
                                     Неверно, попробуйте еще раз.
@@ -69,20 +74,19 @@ class="ms-auto btn btn-close px-2"
                             @endif
 
                             @foreach($currentQuestion->getAnswers() as $answer)
-                                <a href="{{route('stream.quiz.set-answer',['answer'=> $answer ])}}"
+                                <a href="{{ route('stream.quiz.set-answer', ['answer'=> $answer]) }}"
                                    data-turbo-method="post"
-                                   class="btn btn-secondary d-flex w-100 mb-3
+                                   class="btn btn-secondary w-100 mb-3
+                                   d-block text-start fw-normal
                                     {{ $currentQuestion->isCorrect($quiz->userAnswer) && $answer === $quiz->userAnswer ? 'btn-success' : '' }}
-                                   {{ in_array($answer, $quiz->currentAnswers, true) ? 'btn-danger' : '' }}"
-                                    {{ in_array($answer, $quiz->currentAnswers, true) ? "disabled" : '' }}
+                                    {{ $quiz->hasIncorrectAnswer($answer) ? 'btn-danger disabled' : '' }}"
                                 >
-                                    {{ __($answer) }}
+                                    {!! \Illuminate\Support\Str::of($answer)->inlineMarkdown() !!}
                                 </a>
                             @endforeach
                         </div>
                     @else
-                        <div class="{{ !$quiz->displayInfo ? 'visually-hidden' : ''}}">
-
+                        <div>
                             <h5 class="text-center mb-3">Верно!</h5>
 
                             <div class="alert alert-success mb-3 py-2" role="alert">
@@ -98,36 +102,31 @@ class="btn btn-secondary d-flex w-100 mb-3
                     @endif
                 </div>
 
-                <div class="row align-items-center mb-3">
-                    <div class="col-auto text-danger opacity-75">
-                        @foreach([1,2,3] as $value)
+                <div class="row align-items-center mb-3 opacity-75">
+                    <div class="col-auto text-primary">
+                        @foreach(range(1, \App\Quiz\QuizState::LIVE) as $value)
                             <span class="position-relative">
-                            <x-icon path="{{ $quiz->live >= $value ? 'et.heart-fill' : 'et.heart-empty' }}"/>
-
-                            @if($quiz->isIncorrect && $quiz->live +1 == $value)
-                                    <span class="quiz-broken-heart"
-                                          data-controller="lottie"
-                                          data-lottie-loop-value="false"
-                                          data-lottie-path-value="/animation/broken-heart"></span>
-                                @endif
+                                <x-icon path="{{ $quiz->live >= $value ? 'bs.heart-fill' : 'bs.heartbreak' }}"
+                                        class="{{ $quiz->live >= $value ? '' : 'text-secondary opacity-50' }}"/>
                             </span>
                         @endforeach
                     </div>
-                    <div class="col d-flex align-items-center ">
+                    <div class="col d-flex align-items-center">
                         <div class="col px-2">
-                            <div class="progress progress-bg-absolute">
+                            <div class="progress border border-pro progress-bg-absolute">
                                 <div class="progress-bar bg-index" role="progressbar"
-                                     style="width:{{ $currentStepPercent }}%">
+                                     style="width:{{ $quiz->currentStepPercent() }}%">
                                 </div>
                             </div>
                         </div>
                         <div class="col-auto d-flex align-items-center px-2">
-                            <small class="text-muted"> {{ $quiz->stepProgressBar }}
-                                /{{ $quiz->countQuestions }}</small>
+                            <small class="text-muted"> {{ $quiz->step + 1 }}/{{ count($quiz->questions) }}</small>
                         </div>
                     </div>
                 </div>
-                @if($quiz->stepProgressBar == $quiz->countQuestions)
+
+
+                @if($quiz->step == count($quiz->questions))
                     <div class="">
                         <a href="{{route('stream.quiz.next')}}"
                            {{ !empty($quiz->userAnswer) ? '' : 'disabled'  }}
@@ -140,7 +139,6 @@ class="btn btn-primary w-100" aria-current="true">
                     <div class="">
                         <a href="{{route('stream.quiz.next')}}"
                            data-turbo-method="post"
-                           {{ !empty($quiz->userAnswer) ? '' : 'disabled'  }}
                            class="btn btn-primary w-100" aria-current="true">
                             Продолжить
                         </a>
diff --git a/routes/web.php b/routes/web.php
index b7f6bc56..e577730a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -458,6 +458,24 @@
 Route::get('/@{user:nickname}/meets', [\App\Http\Controllers\ProfileController::class, 'meets'])
     ->name('profile.meets');
 
+
+
+/*
+|--------------------------------------------------------------------------
+| Pastebin
+|--------------------------------------------------------------------------
+*/
+
+Route::any('/test2/start', [\App\Http\Controllers\QuizController::class, 'start'])->name('stream.quiz.start');
+Route::post('/test2/next', [\App\Http\Controllers\QuizController::class, 'next'])->name('stream.quiz.next');
+Route::post('/test2/answer', [\App\Http\Controllers\QuizController::class, 'answer'])->name('stream.quiz.set-answer');
+
+
+Route::get('/quiz', [\App\Http\Controllers\QuizController::class, 'index'])->name('quiz');
+Route::get('/test', [\App\Http\Controllers\QuizController::class, 'index'])->name('quiz2.index');
+
+
+
 /*
 |--------------------------------------------------------------------------
 | Pastebin