Added tracer and caterpillar