tracing added to better debug in prod