diff --git a/include/timestamp.h b/include/timestamp.h
index 40050f7..8836071 100644
--- a/include/timestamp.h
+++ b/include/timestamp.h
@@ -49,8 +49,14 @@ const char* task_type2str(int task_type);
 #define TS_LOCK_START			TIMESTAMP(30)
 #define TS_LOCK_END			TIMESTAMP(31)
 
-#define TS_READ_LOCK_START		TIMESTAMP(32)
-#define TS_READ_LOCK_END		TIMESTAMP(33)
+#define TS_FZ_ENTER_START		TIMESTAMP(32)
+#define TS_FZ_ENTER_END			TIMESTAMP(33)
+
+#define TS_FZ_EXIT_START		TIMESTAMP(34)
+#define TS_FZ_EXIT_END			TIMESTAMP(35)
+
+//#define TS_READ_LOCK_START		TIMESTAMP(32)
+//#define TS_READ_LOCK_END		TIMESTAMP(33)
 
 #define TS_LOCK_SUSPEND			TIMESTAMP(38)
 #define TS_LOCK_RESUME			TIMESTAMP(39)
@@ -58,8 +64,8 @@ const char* task_type2str(int task_type);
 #define TS_UNLOCK_START			TIMESTAMP(40)
 #define TS_UNLOCK_END			TIMESTAMP(41)
 
-#define TS_READ_UNLOCK_START		TIMESTAMP(42)
-#define TS_READ_UNLOCK_END		TIMESTAMP(43)
+//#define TS_READ_UNLOCK_START		TIMESTAMP(42)
+//#define TS_READ_UNLOCK_END		TIMESTAMP(43)
 
 #define PID_RECORDS_RANGE		99
 
diff --git a/src/job_stats.c b/src/job_stats.c
index f1406f4..7aa023d 100644
--- a/src/job_stats.c
+++ b/src/job_stats.c
@@ -97,14 +97,14 @@ static void print_stats(
 static void print_task_info(struct task *t)
 {
 	if (want_ms)
-		printf("# task NAME=%s PID=%d COST=%.2f PERIOD=%.2f CPU=%d\n",
+		printf("# task NAME=%s PID=%d COST=%.2f(ms) PERIOD=%.2f(ms) CPU=%d\n",
 		       tsk_name(t),
 		       t->pid,
 		       nano_to_ms(exe(t)),
 		       nano_to_ms(per(t)),
 		       tsk_cpu(t));
 	else
-		printf("# task NAME=%s PID=%d COST=%lu PERIOD=%lu CPU=%d\n",
+		printf("# task NAME=%s PID=%d COST=%lu(ns) PERIOD=%lu(ns) CPU=%d\n",
 		       tsk_name(t),
 		       t->pid,
 		       (unsigned long) exe(t),
diff --git a/src/timestamp.c b/src/timestamp.c
index 581edc2..057cd18 100644
--- a/src/timestamp.c
+++ b/src/timestamp.c
@@ -32,9 +32,11 @@ static struct event_name event_table[] =
 	EVENT(SYSCALL_IN),
 	EVENT(SYSCALL_OUT),
 	EVENT(LOCK),
+	EVENT(FZ_ENTER),
+	EVENT(FZ_EXIT),
 	EVENT(UNLOCK),
-	EVENT(READ_LOCK),
-	EVENT(READ_UNLOCK),
+	//EVENT(READ_LOCK),
+	//EVENT(READ_UNLOCK),
 	{"LOCK_SUSPEND", TS_LOCK_SUSPEND},
 	{"LOCK_RESUME", TS_LOCK_RESUME},
 };
diff --git a/st-trace-schedule b/st-trace-schedule
index ad9a945..43fa6da 100755
--- a/st-trace-schedule
+++ b/st-trace-schedule
@@ -76,7 +76,8 @@ NUM_CPUS=`egrep -c '^processor|online'   /proc/cpuinfo`
 # 509 - sched_trace_action
 # 510 - sched_trace_sys_release
 # 511 - sched_trace_last_suspension_as_completion
-ST_IDS="501 502 503 504 505 506 507 508 509 510 511"
+#ST_IDS="501 502 503 504 505 506 507 508 509 510 511"
+ST_IDS="501 502 503 506 510 511"
 
 DIR=`mktemp -d` || die "mktemp failed"