Finalized changes with all traces working