More trace updates

This is the version used to generate the logs in D4