removed dependency on TBMacros