Merge track-me and log-me