Added trace macro
Added a flag
Added trace