big commit
+ trace_preprocessor