added safe tracer back in and update demo