refactor
change trace event