Added multiple trace code to GUI
Resolved merge conflicts
Resolved merge conflicts