reorganize trace passing