diff --git a/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js b/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js
index d8e3945..79322a9 100644
--- a/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js
+++ b/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js
@@ -2,9 +2,9 @@ function init_saimod_uvote_vote_edit(){
 $('.bt_data_submit').click(function() {
         var poll_ID = $(this).attr('poll_ID');
         var title = $('#' + poll_ID + '_vote_title').val();
-        var time_start = $('#' + poll_ID + '_time_start').val();
+        var time_end = $('#' + poll_ID + '_time_end').val();
         var iframe_link = $('#' + poll_ID + '_iframe_link').val();
-        var data = {poll_ID: poll_ID, title: title, iframe_link: iframe_link}
+        var data = {poll_ID: poll_ID, title: title, time_end: time_end, iframe_link: iframe_link};
         $.getJSON('./sai.php?sai_mod=.SAI.saimod_uvote_vote_edit&action=edit_vote&data=' + JSON.stringify(data), function(data) {
             var items = [];        
             if(data.status == true){
diff --git a/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php b/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php
index 888d080..56432fa 100644
--- a/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php
+++ b/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php
@@ -10,14 +10,11 @@ class saimod_uvote_vote_edit extends \SYSTEM\SAI\SaiModule {
         return $res->affectedRows() == 0 ? \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("no data added")) : \SYSTEM\LOG\JsonResult::ok();
         new \SYSTEM\LOG\INFO($vote);
     }
-    
-    public static function sai_mod_saimod_uvote_vote_edit_action_insertPartyChoice ($poll_ID, $party, $votes_pro, $votes_contra, $nr_attending, $total, $choice){
-        $vars = votes::insertPartyChoice($poll_ID, $party, $votes_pro, $votes_contra, $nr_attending, $total, $choice);       
-    }
 
     public static function sai_mod_saimod_uvote_new_vote(){
-        
-        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/main.tpl'));
+        $ID = array();
+        $ID['ID'] = '';
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/main.tpl'), $ID);
     }
 
 
@@ -32,8 +29,8 @@ class saimod_uvote_vote_edit extends \SYSTEM\SAI\SaiModule {
         foreach($votes as $vote){
             $time_remain = strtotime($vote['time_end'])-  microtime(true);
             $time_span = strtotime($vote['time_end']) - strtotime($vote['time_start']);
-            $vote['vote_class'] = self::tablerow_class(\votes::getUserPollData($vote['ID']));
-            $vote['bt_vote_class'] = self::tablerow_class($vote['bt_choice']);            
+            $vote['vote_class'] = \switchers::tablerow_class(\votes::getUserPollData($vote['ID']));
+            $vote['bt_vote_class'] = \switchers::tablerow_class($vote['bt_choice']);            
             $vote['time_left'] = round($time_remain/($time_span+1)*100,0);
             $vote['time_done'] = 100-$vote['time_left'];
             
@@ -42,21 +39,17 @@ class saimod_uvote_vote_edit extends \SYSTEM\SAI\SaiModule {
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl'), array('list' => $result));
     }
     
-    private static function tablerow_class($choice){
-        switch($choice){
-            case 1:
-                return 'pro';
-            case 2:
-                return 'contra';
-            case 3:
-                return 'ent';
-            default:
-                return '';
-        }        
-    }
-    public static function sai_mod__SAI_saimod_uvote_vote_edit_action_edit_vote($data){
-        $data = \json_decode($data);
-        new \SYSTEM\LOG\WARNING(print_r($data, TRUE));
+    public static function sai_mod__SAI_saimod_uvote_vote_edit_action_edit_vote($data_json){
+        $data_stdClass = \json_decode($data_json);
+        $data = (array)$data_stdClass;
+        if(!$data['poll_ID']){
+            new \SYSTEM\LOG\WARNING(print_r($data, TRUE));
+            \SYSTEM\DBD\SYS_TEXT_SAVE::QI(array($stamp,'deDE',$data['title'], 'wed', ''));
+            \SYSTEM\DBD\SYS_TEXT_SAVE_TAG::QI(array($stamp,$tag));          
+            return \SQL\UVOTE_DATA_NEW_POLL::QA(array($data['title'], $data['time_end'], $data['iframe_link']));
+        }
+        return \SQL\UVOTE_DATA_EDIT_POLL::QA(array($data['poll_ID'], $data['title'], $data['time_end'], $data['iframe_link']));
+        
     }
     public static function html_li_menu(){return '<li><a href="#!vote">Edit Votes</a></li>';}
     public static function right_public(){return false;}    
diff --git a/uvote/sql/qq/UVOTE_DATA_EDIT_POLL.php b/uvote/sql/qq/UVOTE_DATA_EDIT_POLL.php
new file mode 100644
index 0000000..44720ff
--- /dev/null
+++ b/uvote/sql/qq/UVOTE_DATA_EDIT_POLL.php
@@ -0,0 +1,8 @@
+<?php
+namespace SQL;
+
+class UVOTE_EDIT_NEW_POLL extends \SYSTEM\DB\QP {
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'UPDATE uvote_votes SET title = "testtest", iframe_link = "testtestttest" WHERE ID = 40;'
+;}}
\ No newline at end of file
diff --git a/uvote/sql/qq/UVOTE_DATA_NEW_POLL.php b/uvote/sql/qq/UVOTE_DATA_NEW_POLL.php
index 1511be1..3fc8ce9 100644
--- a/uvote/sql/qq/UVOTE_DATA_NEW_POLL.php
+++ b/uvote/sql/qq/UVOTE_DATA_NEW_POLL.php
@@ -4,6 +4,6 @@ namespace SQL;
 class UVOTE_DATA_NEW_POLL extends \SYSTEM\DB\QP {
     public static function get_class(){return \get_class();}
     public static function mysql(){return
-'INSERT INTO `uvote_votes` (`title`, `iframe_link`) 
-    VALUES (?, ?);'
+'INSERT INTO `uvote_votes` (`group`, `title`, `p_fields`, `text`, `initiative`, `time_start`, `time_end`, `quick`, `iframe_link`, `bt_choice`) VALUES (1, ?, 0, "", "", NOW(), ?, NULL, ?, "");
+'
 ;}}
\ No newline at end of file