Modify for new log system