Tracing and breaking added