diff --git a/h2r-bwmsgsv2.php b/h2r-bwmsgsv2.php
index a5407ba05a031f74a117c5b828fa296c62b37cd8..65dc5b642e1bcf69ceed444e502c6da26946cbe4 100644
--- a/h2r-bwmsgsv2.php
+++ b/h2r-bwmsgsv2.php
@@ -19,6 +19,7 @@
 */
 
 $time = microtime(true);
+$tai_timestamp = trim(shell_exec('./tai'));
 
 $raw_data = file_get_contents('php://input');
 
@@ -37,12 +38,14 @@ if (!empty($redis_auth)) {
 	$redis->auth($redis_auth);
 }
 
-# TODO: MUST add ./tai versions of $time and $time2
-
 $time2 = microtime(true);
+$tai_timestamp2 = trim(shell_exec('./tai'));
 
 $rv = $redis->lPush('incoming_messages-'.'test1a',  # TODO: update queue name
-	'"ts_020-first_db_hit":'.$time2.',"ts_010-first_received":'.$time.',"MSG":'.$raw_data);
+	'"ts_020_tai-first_db_hit":'.$tai_timestamp2.
+	',"ts_020_unix-first_db_hit":'.$time2.
+	',"ts_010_tai-first_received":'.$tai_timestamp.
+	',"ts_010_unix-first_received":'.$time.',"MSG":'.$raw_data);
 
 if (!$rv) {
 	error_log("ERROR 2a in lPush at $time $time2 - cannot save $raw_data");