diff --git a/MkpWIFI/commands.py b/MkpWIFI/commands.py
index 2a543a7..0557344 100644
--- a/MkpWIFI/commands.py
+++ b/MkpWIFI/commands.py
@@ -46,77 +46,71 @@ MKPcommands = {
         'end': '\x03',   #ETX 
         'command': 'TZ',
         'success': '\x06\x02[0-9]OK\x03',
-        'error': '',
-        'args': []
+        'error': '[0-9]E[0-9]',
+        'args': ['imageName', 'printMode']
         },
     'sendImage': {
         'defPrefix': True,
-        'command': 'EW',
-        'success': 'Ok',
-        'error': 'somethingsomething',
-        'args': ['','']
+        'command': 'EW----',
+        'success': None,
+        'error': None,
+        'args': ['imageName']
         },
     'sendImageEnd': {
         'defPrefix': True,
-        'command': 'EX',
-        'success': 'Ok',
-        'error': 'somethingsomething',
-        'args': ['','']
+        'command': 'EX---',
+        'success': 'OK\r',
+        'error': None,
         },
     'receiveImage': {
         'defPrefix': True,
         'command': 'EL',
-        'success': 'Ok',
-        'error': 'somethingsomething',
-        'args': ['','']
+        'success': None,
+        'error': None
         },
     'receiveDir': {
         'defPrefix': True,
-        'command': 'ED',
-        'success': 'Ok',
-        'error': 'somethingsomething',
-        'args': ['','']
+        'command': 'ED----',
+        'success': None,
+        'error': None
         },
     'deleteImage': {
         'defPrefix': True,
-        'command': 'EQ',
-        'success': 'Ok',
-        'error': 'somethingsomething',
-        'args': ['','']
+        'command': 'EQ----',
+        'success': 'OK\r',
+        'error': 'Err\r',
+        'args': ['imageName']
         },
     'sendDate': {
         'defPrefix': True,
         'command': '*STD',
-        'success': 'Ok',
-        'error': 'somethingsomething',
-        'args': ['','']
+        'success': 'Ok\r',
+        'error': 'Err\r',
+        'args': ['dateTime','offset']
         },
     'receiveDate': {
         'defPrefix': True,
         'command': '*GSTD',
-        'success': 'Ok',
-        'error': 'somethingsomething',
+        'success': '[0-9]{13}',
+        'error': None,
         'args': ['','']
         },
     'status': {
         'defPrefix': True,
         'command': 'SV',
-        'success': 'Ok',
-        'error': 'somethingsomething',
-        'args': ['','']
+        'success': None,
+        'error': None
         },
     'status1': {
             'defPrefix': True,
             'command': 'S1',
-            'success': 'Ok',
-            'error': 'somethingsomething',
-            'args': ['','']
+            'success': None,
+            'error': None
         },
     'status2': {
         'defPrefix': True,
         'command': 'S2',
-        'success': 'Ok',
-        'error': 'somethingsomething',
-        'args': ['','']
+        'success': None,
+        'error': None
         },
     }