New trace, new main.cpp