Ported to new log system