diff --git a/Classes/Controller/FormController.php b/Classes/Controller/FormController.php
index e7fa26b..951e8fc 100755
--- a/Classes/Controller/FormController.php
+++ b/Classes/Controller/FormController.php
@@ -17,10 +17,9 @@ class FormController
      */
     public function manipulateMailObjectOnCreate(Mail $mail)
     {
-        foreach ($mail->getAnswers() as $answer) {
-            if ($answer->getValue() === 'alex') {
-                $answer->setValue('alexander');
-            }
+        // example how to get an answer from the mail object and manipulate a value (set firstname if email fits)
+        if ($mail->getAnswersByFieldMarker()['email']->getValue() === 'manipulatesender@powermailextended.org') {
+            $mail->getAnswersByFieldMarker()['firstname']->setValue('heyholetsgo');
         }
     }
 }
diff --git a/ext_localconf.php b/ext_localconf.php
index 30013e8..6cf5266 100755
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -7,16 +7,16 @@
     \TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class
 );
 
-// Manipulate a value before sending
-//$signalSlotDispatcher->connect(
-//    'In2code\Powermail\Controller\FormController',
-//    'createActionBeforeRenderView',
-//    'In2code\Powermailextended\Controller\FormController',
-//    'manipulateMailObjectOnCreate',
-//    false
-//);
+// Manipulate a value before sending example
+$signalSlotDispatcher->connect(
+    \In2code\Powermail\Controller\FormController::class,
+    'createActionBeforeRenderView',
+    \In2code\Powermailextended\Controller\FormController::class,
+    'manipulateMailObjectOnCreate',
+    false
+);
 
-// Change receiver mail
+// Change receiver mail example
 $signalSlotDispatcher->connect(
     \In2code\Powermail\Domain\Service\SendMailService::class,
     'sendTemplateEmailBeforeSend',