added trace to all other files; made sure it plays nicely with other files