beefed up some traces