Merged with new log